TortoiseGit.org » Documentation » TortoiseGitMerge

TortoiseGitMerge Manual

TortoiseGitMerge
   Next

TortoiseGitMerge

A diff/merge tool for Windows

Version 2.17.0

Stefan Küng

Lübbe Onken

Simon Large

Sven Strickroth

Table of Contents

Preface
TortoiseGitMerge is free!
Acknowledgments
1. Introduction
Overview
TortoiseGitMerge's History
2. Basic Concepts
Viewing and Merging Differences
Editing Conflicts
Applying Patches
3. Using TortoiseGitMerge
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
color Settings Page
A. Keyboard Shortcuts
Keyboard Shortcuts
General Keyboard Shortcuts
Diff-Mode Keyboard Shortcuts
Conflict Resolution Mode Keyboard Shortcuts
B. Automating TortoiseGitMerge
TortoiseGitMerge 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
   Next
   Preface