![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:26:40 +0000 (11:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 19:26:40 +0000 (11:26 -0800) |
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
Trivial merge