diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-02-27 14:31:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-28 23:42:23 +0300 |
| commit | aa03f60463129194d328035f9974be4fa951dd44 (patch) | |
| tree | 881b89740ae07979b0e5485beb744677aadd1685 /Documentation/merge-config.txt | |
| parent | 046613c5465e4fc0611f93a5ef31d3815fb50c22 (diff) | |
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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 1e5c22c5e5..90587db169 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -33,10 +33,10 @@ merge.stat:: 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", - "diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and - "opendiff". Any other value is treated is custom merge tool + linkgit:git-mergetool[1]. Valid built-in values are: "araxis", + "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", + "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" + and "xxdiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool.<tool>.cmd option. merge.verbosity:: |