From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Feb 2015 20:28:25 +0000 (-0800)
Subject: Merge branch 'ab/merge-file-prefix'
X-Git-Tag: v2.4.0-rc0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f11f76b2bbcd23fe403744c055456a0bdf0981e7;p=thirdparty%2Fgit.git

Merge branch 'ab/merge-file-prefix'

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

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

f11f76b2bbcd23fe403744c055456a0bdf0981e7