Merge branch 'da/maint-mergetool-twoway'
* da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
Junio C Hamano committed
Jan 31, 2012 at 22:01 UTC
5e92376f8f70603e570f821267fc86c78175eb09
No changes.
* da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
No changes.