mergetool: add support for ECMerge
authorSteffen Prohaska <prohaska@zib.de>
Wed, 17 Oct 2007 17:16:12 +0000 (19:16 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 18 Oct 2007 07:46:24 +0000 (03:46 -0400)
commitca8e6b7...55bfeccbd08182205102d44874f787b6
treeb173fdf...c64a6e2811c5f6d40e8d324d248a98fdcopy hash to clipboard (tree)
parente3fa2c7...1fdc490494e8e0855bcee4d7e58ada6acopy hash to clipboard (diff)
Documentation/git-mergetool.txt
git-mergetool.sh