]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sp/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Nov 2007 06:53:55 +0000 (23:53 -0700)
commit6959893b0b65ebc68ce2fb524a8ec15a26ca4972
treea499f6b0a7309306f667b3cbded1a1bcf1ff35de
parent452b80058235040461dae01933270c6668741b64
parentd279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10
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