| commit | ca8e6b7a55bfeccbd08182205102d44874f787b6 | |
| author | Steffen Prohaska <prohaska@zib.de> | |
| Wed, 17 Oct 2007 17:16:12 +0000 (17 19:16 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 18 Oct 2007 07:46:24 +0000 (18 03:46 -0400) | ||
| tree | b173fdffc64a6e2811c5f6d40e8d324d248a98fd | treesnapshot (tar.gz zip) |
| parent | e3fa2c761fdc490494e8e0855bcee4d7e58ada6a | commitdiff |
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>
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>
| Documentation/git-mergetool.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |