From: Junio C Hamano Date: Wed, 17 Nov 2010 23:00:56 +0000 (-0800) Subject: Merge branch 'tr/maint-merge-file-subdir' X-Git-Tag: v1.7.4-rc0~136 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba0254cb32537b7a7e92854a51256475ee83cdda?ds=inline;hp=--cc 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 --- ba0254cb32537b7a7e92854a51256475ee83cdda