![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700) |
* sp/mergetool:
mergetool: avoid misleading message "Resetting to default..."
mergetool: add support for ECMerge
mergetool: use path to mergetool in config var mergetool.<tool>.path
mergetool: avoid misleading message "Resetting to default..."
mergetool: add support for ECMerge
mergetool: use path to mergetool in config var mergetool.<tool>.path
Trivial merge