mergetool--lib: Add Beyond Compare 3 as a tool

[git.git] / Documentation / git-mergetool.txt

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 4987245aca2877f233ab26f2cf244430b2da8211..740b3f1e670552d3331bb2de2754c46c68be222a 100644 (file)
--- 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'