Table of Contents

Preface

1. TortoiseMerge is free!

2. Acknowledgments

1. Introduction

1.1. Overview

1.2. TortoiseMerge's History

2. Basic Concepts

2.1. Viewing and Merging Differences

2.2. Editing Conflicts

2.3. Applying Patches

3. Using TortoiseMerge

3.1. Viewing Modes

3.1.1. Viewing / Merging

3.1.2. Applying Patches

3.2. Buttons and Other Controls

3.3. Line Status Icons

3.4. Merging / Editing Conflicts

3.5. Open Files

3.5.1. Viewing / Merging

3.5.2. Applying Patches

3.6. Settings

3.6.1. Main Settings Page

3.6.2. Colour Settings Page

A. keyboard shortcuts

A.1. Keyboard shortcuts

B. Automating TortoiseMerge

B.1. TortoiseMerge Command Line Switches

Glossary