Merge branch 'da/maint-mergetool-twoway'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800)
commit5e92376f8f70603e570f821267fc86c78175eb09
tree053d3d8e89d274c552ee3d2b807de71190f2a80e
parentab085174294ff473fbc1aca59f3b4c052e9acd77
parentec245ba04944473ba6657a826643ef90ed02b51d
Merge branch 'da/maint-mergetool-twoway'

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