From ffe6dc081aa23d56e6306d143d99ca508db38c5e Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sun, 27 Feb 2011 12:32:46 +0100 Subject: mergetool--lib: Add Beyond Compare 3 as a tool Signed-off-by: Sebastian Schuberth Tested-by: Chris Packham Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/merge-config.txt') diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 90587db169..33bf74c334 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -34,7 +34,7 @@ merge.stat:: merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "araxis", - "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", + "bc3", "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. -- cgit v1.2.3