diff options
| author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-04-06 01:31:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:55 -0700 |
| commit | b98c212a9fd97300a8cf39015b8d693f319fd71c (patch) | |
| tree | a5786f8382dba31f7b168592295e351f10e40e22 /Documentation/merge-config.txt | |
| parent | bad42732008cb0c1e77046d716e4446b1545d4d0 (diff) | |
| download | git-b98c212a9fd97300a8cf39015b8d693f319fd71c.tar.gz git-b98c212a9fd97300a8cf39015b8d693f319fd71c.tar.xz | |
git-mergetool: add new merge tool TortoiseMerge
TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can
only be used as a merge tool with an existing base file. It cannot be
used without a base nor as a diff tool.
The documentation only mentions the slash '/' as command line option
prefix, which refused to work, but the parser also accepts the dash '-'
See http://code.google.com/p/msysgit/issues/detail?id=226
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9c44af8e4..8c10f6670 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -23,7 +23,7 @@ merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", - "ecmerge" and + "ecmerge", tortoisemerge and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. |