![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:00:56 +0000 (15:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:00:56 +0000 (15:00 -0800) | ||
| commit | ba0254cb32537b7a7e92854a51256475ee83cdda | |
| tree | 6e8bcfa99201c20d8647600e74b78e580cfd23cf | tree | snapshot |
| parent | e2110c8d881eb61db581b6b9ddd9568f20cf24c7 | commit | diff |
| parent | 55846b9abd128185388418e025651cfd6a299a0e | commit | diff |
Merge branch 'tr/maint-merge-file-subdir'
* 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