From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 18:39:06 +0000 (-0700)
Subject: Merge branch 'tr/maint-merge-file-subdir' into next
X-Git-Tag: ko-next~179
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2873a4455aee391083dff26a9476dfc5afaa2a3;p=git.git

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

a2873a4455aee391083dff26a9476dfc5afaa2a3