diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-02-27 12:31:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-28 12:42:23 -0800 |
| commit | aa03f60463129194d328035f9974be4fa951dd44 (patch) | |
| tree | 881b89740ae07979b0e5485beb744677aadd1685 /Documentation/git-mergetool.txt | |
| parent | 046613c5465e4fc0611f93a5ef31d3815fb50c22 (diff) | |
| download | git-aa03f60463129194d328035f9974be4fa951dd44.tar.gz git-aa03f60463129194d328035f9974be4fa951dd44.tar.xz | |
mergetool--lib: Sort tools alphabetically for easier lookup
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Tested-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 1f75a848b..4987245ac 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,8 +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, - diffuse, tortoisemerge, opendiff, p4merge and araxis. + araxis, diffuse, ecmerge, emerge, gvimdiff, kdiff3, + meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff. + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the |