Files
git/Documentation/git-mergetool.txt
Steffen Prohaska ca8e6b7a55 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>
2007-10-18 03:46:24 -04:00

1.4 KiB