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 /builtin.h | |
| parent | e3fa2c761fdc490494e8e0855bcee4d7e58ada6a (diff) | |
| download | git-ca8e6b7a55bfeccbd08182205102d44874f787b6.tar.gz | |
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 'builtin.h')
0 files changed, 0 insertions, 0 deletions