![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700) | ||
| commit | a2873a4455aee391083dff26a9476dfc5afaa2a3 | |
| tree | c390e0f779608b5840ae33dcae4d5f8a6eb5b204 | tree | snapshot |
| parent | 80ad03a3b93a32f234889ee528475187ddee2905 | commit | diff |
| parent | 55846b9abd128185388418e025651cfd6a299a0e | commit | diff |
Merge branch 'tr/maint-merge-file-subdir' into next
* 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