Merge branch 'da/maint-mergetool-twoway' into maint
authorJunio C Hamano <redacted>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
committerJunio C Hamano <redacted>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
commit38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5
tree0c17b09af9b08d92787da10a8c68e2f0e80f75c9
parent2d1abfa8eeeb168bdd5d05302c1a57f30973711e
parentec245ba04944473ba6657a826643ef90ed02b51d
Merge branch 'da/maint-mergetool-twoway' into maint

* da/maint-mergetool-twoway:
  mergetool: Provide an empty file when needed
git clone https://git.99rst.org/PROJECT