From: David Aguilar Date: Mon, 06 Apr 2009 08:31:16 GMT Subject: [PATCH 01/14] doc/merge-config: list ecmerge as a built-in merge tool Message-ID: <1239006689-14695-2-git-send-email-davvid@gmail.com> In-Reply-To: <1239006689-14695-1-git-send-email-davvid@gmail.com> From: Markus Heidelberg Signed-off-by: Markus Heidelberg --- Documentation/merge-config.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 1ff08ff..9c44af8 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. -- 1.6.2.2.414.g81aa9