Merge branch 'da/maint-mergetool-twoway' into maint
* da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
Junio C Hamano committed
Feb 10, 2012 at 13:59 UTC
38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5
No changes.