From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2012 21:59:01 +0000 (-0800)
Subject: Merge branch 'da/maint-mergetool-twoway' into maint
X-Git-Tag: v1.7.9.1~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5;hp=-c;p=git.git

Merge branch 'da/maint-mergetool-twoway' into maint

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

38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5