![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Feb 2012 06:01:17 +0000 (22:01 -0800) |
* da/maint-mergetool-twoway:
mergetool: Provide an empty file when needed
mergetool: Provide an empty file when needed
Trivial merge