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/git-mergetool.txt | |
| parent | git-mergetool/difftool: make (g)vimdiff workable under Windows (diff) | |
| download | tgif-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/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 5d3c632872..5edac4d267 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,7 +26,8 @@ OPTIONS --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, + tortoisemerge and opendiff + If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the |