diff options
| author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-04-06 01:31:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:55 -0700 |
| commit | da81688cc5639c9c482a89a4b732737f7aa0d61d (patch) | |
| tree | 6f1e0ae58e0f60c199f84c5e9459021b96d5bb73 | |
| parent | 982962ce24c7d614d94f40de54cfcfdf71dcb0d2 (diff) | |
| download | git-da81688cc5639c9c482a89a4b732737f7aa0d61d.tar.gz git-da81688cc5639c9c482a89a4b732737f7aa0d61d.tar.xz | |
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>
| -rw-r--r-- | 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 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.<tool>.cmd option. |