git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3fa2c7)
mergetool: add support for ECMerge
authorSteffen Prohaska <redacted>
Wed, 17 Oct 2007 17:16:12 +0000 (19:16 +0200)
committerShawn O. Pearce <redacted>
Thu, 18 Oct 2007 07:46:24 +0000 (03:46 -0400)
commitca8e6b7a55bfeccbd08182205102d44874f787b6
treeb173fdffc64a6e2811c5f6d40e8d324d248a98fdtree | snapshot
parente3fa2c761fdc490494e8e0855bcee4d7e58ada6acommit | diff
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 <redacted>
Signed-off-by: Shawn O. Pearce <redacted>
Documentation/git-mergetool.txt diff | blob | history
git-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT