From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 21:13:10 +0000 (-0800)
Subject: Merge branch 'ab/merge-file-prefix' into maint
X-Git-Tag: v2.3.2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33367575b85a115900deac600cc4f8f03ec4754b;p=thirdparty%2Fgit.git

Merge branch 'ab/merge-file-prefix' into maint

"git merge-file" did not work correctly in a subdirectory.

* ab/merge-file-prefix:
  merge-file: correctly open files when in a subdir
---

33367575b85a115900deac600cc4f8f03ec4754b