From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Feb 2012 06:01:17 +0000 (-0800)
Subject: Merge branch 'da/maint-mergetool-twoway'
X-Git-Tag: v1.7.10-rc0~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e92376f8f70603e570f821267fc86c78175eb09;p=git.git

Merge branch 'da/maint-mergetool-twoway'

* da/maint-mergetool-twoway:
  mergetool: Provide an empty file when needed
---

5e92376f8f70603e570f821267fc86c78175eb09