![[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) | ||
| commit | 6959893b0b65ebc68ce2fb524a8ec15a26ca4972 | |
| tree | a499f6b0a7309306f667b3cbded1a1bcf1ff35de | tree | snapshot |
| parent | 452b80058235040461dae01933270c6668741b64 | commit | diff |
| parent | d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10 | commit | diff |
Merge branch 'sp/mergetool'
* 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
* 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