![[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) | ||
| commit | a49e9af4939c1223020db7915ee612d836c1bcdc | |
| tree | 51285aad2c6a4942b85542df0a07d658d69ef6df | tree | snapshot |
| parent | 9f6774ed86a9ac22142c0b37e26e67eb1d032962 | commit | diff |
| parent | 55846b9abd128185388418e025651cfd6a299a0e | commit | diff |
Merge branch 'tr/maint-merge-file-subdir' into maint
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0