From aa03f60463129194d328035f9974be4fa951dd44 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sun, 27 Feb 2011 12:31:37 +0100 Subject: mergetool--lib: Sort tools alphabetically for easier lookup Signed-off-by: Sebastian Schuberth Tested-by: Chris Packham Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/merge-config.txt') 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..cmd option. merge.verbosity:: -- cgit v1.2.3