diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2007-10-17 19:16:12 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 03:46:24 -0400 |
| commit | ca8e6b7a55bfeccbd08182205102d44874f787b6 (patch) | |
| tree | b173fdffc64a6e2811c5f6d40e8d324d248a98fd /Documentation/git-mergetool.txt | |
| parent | e3fa2c761fdc490494e8e0855bcee4d7e58ada6a (diff) | |
| download | git-ca8e6b7a55bfeccbd08182205102d44874f787b6.tar.gz git-ca8e6b7a55bfeccbd08182205102d44874f787b6.tar.xz | |
mergetool: add support for ECMerge
Add support to mergetool for ECMerge available from
http://www.elliecomputing.com/Products/merge_overview.asp
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 78b2f433b..a26c26016 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the |