From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Nov 2007 06:53:55 +0000 (-0700)
Subject: Merge branch 'sp/mergetool'
X-Git-Tag: v1.5.4-rc0~293
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6959893b0b65ebc68ce2fb524a8ec15a26ca4972;p=git.git

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
---

6959893b0b65ebc68ce2fb524a8ec15a26ca4972