![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 May 2011 17:52:16 +0000 (10:52 -0700) |
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
Pass empty file to p4merge where no base is suitable.
Trivial merge