builtin/diff.c: remove duplicated call to diff_result_code()

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 90587db169870c682e747440b507273152e1e348..33bf74c334ead9ee5e44d81d15d544b0625f2894 100644 (file)
--- 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.<tool>.cmd option.