From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 19:26:40 +0000 (-0800)
Subject: Merge branch 'tr/maint-merge-file-subdir' into maint
X-Git-Tag: v1.7.3.3~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a49e9af4939c1223020db7915ee612d836c1bcdc;p=git.git

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
---

a49e9af4939c1223020db7915ee612d836c1bcdc