@matheusbsbs / matheus-bagliano / commits / 6959893b0b
Fork 0

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

Junio C Hamano committed Oct 31, 2007 at 23:53 UTC 6959893b0b65ebc68ce2fb524a8ec15a26ca4972

No changes.