![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 21:59:01 +0000 (13:59 -0800) | ||
| committer | Junio 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
mergetool: Provide an empty file when needed
Trivial merge