Andrew's git / gitweb.git / diff
?
Merge branch 'da/maint-mergetool-twoway' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800)
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed

Trivial merge