global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-02 13:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

doc/merge-config: list ecmerge as a built-in merge tool

Browse Source 
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
This commit is contained in:
Markus Heidelberg
2009-04-05 14:42:27 +02:00
committed by Johannes Schindelin
parent f751238609
commit 7ee5b02494
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/merge-config.txt
View File

@@ -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.<tool>.cmd option.