doc/merge-config: list ecmerge as a built-in merge tool
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Markus Heidelberg committed
Apr 6, 2009 at 01:31 UTC
da81688cc5639c9c482a89a4b732737f7aa0d61d
1 file changed
+2
-1
Documentation/merge-config.txt
+2
-1
@@ -22,7 +22,8 @@ merge.stat::
22
merge.tool::
23
Controls which merge resolution program is used by
24
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
25
- "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
25
+ "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
26
+ "ecmerge" and
27
"opendiff". Any other value is treated is custom merge tool
28
and there must be a corresponding mergetool.<tool>.cmd option.
29