summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2011-02-27 12:32:46 +0100
committerJunio C Hamano <gitster@pobox.com>2011-02-28 12:42:38 -0800
commitffe6dc081aa23d56e6306d143d99ca508db38c5e (patch)
tree12e864eedadf5382d26d770786791d3cdeab30a7 /Documentation/git-mergetool.txt
parentaa03f60463129194d328035f9974be4fa951dd44 (diff)
downloadgit-ffe6dc081aa23d56e6306d143d99ca508db38c5e.tar.gz
mergetool--lib: Add Beyond Compare 3 as a tool
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 4987245aca..740b3f1e67 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,7 +26,7 @@ OPTIONS
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- araxis, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
+ araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
+
If a merge resolution program is not specified, 'git mergetool'