From: Markus Heidelberg Date: Mon, 6 Apr 2009 08:31:16 +0000 (-0700) Subject: doc/merge-config: list ecmerge as a built-in merge tool X-Git-Tag: v1.6.3-rc1~13^2~15 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=da81688cc5639c9c482a89a4b732737f7aa0d61d;p=git.git doc/merge-config: list ecmerge as a built-in merge tool Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 1ff08ff2c..9c44af8e4 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -22,7 +22,8 @@ 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", and + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", + "ecmerge" and "opendiff". Any other value is treated is custom merge tool and there must be a corresponding mergetool..cmd option.