From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Jul 2008 23:22:42 +0000 (-0700)
Subject: Merge branch 'ph/mergetool'
X-Git-Tag: v1.6.0-rc0~173
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e707b28d9ea0bebfef5aff977e3ccebd53aa045;p=git.git

Merge branch 'ph/mergetool'

* ph/mergetool:
  Remove the use of '--' in merge program invocation
---

5e707b28d9ea0bebfef5aff977e3ccebd53aa045