TortoiseMerge

A diff/merge tool for Windows

Version 1.9

Stefan Küng

Lübbe Onken

Simon Large

2015/08/20 20:47:31 (r26714)


Table of Contents

Preface
TortoiseMerge is free!
Acknowledgments
1. Introduction
Overview
TortoiseMerge's History
2. Basic Concepts
Viewing and Merging Differences
Editing Conflicts
Applying Patches
3. Using TortoiseMerge
Viewing Modes
Viewing / Merging
Applying Patches
Buttons and Other Controls
Line Status Icons
Merging / Editing Conflicts
Open Files
Viewing / Merging
Applying Patches
Settings
Main Settings Page
Colour Settings Page
A. keyboard shortcuts
Keyboard shortcuts
B. Automating TortoiseMerge
TortoiseMerge Command Line Switches
Glossary

List of Figures

1.1. File Conflict
2.1. File Conflict
3.1. One Pane View
3.2. Two Pane View
3.3. Three Pane View
3.4. Patch File List
3.5. The Open Dialog
3.6. The Settings Main Page
3.7. The Settings Color Page

List of Tables

B.1. List of available command line options