]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3630be2 204a8ff)
Merge branch 'ab/merge-file-prefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:10 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:11 +0000 (13:13 -0800)
"git merge-file" did not work correctly in a subdirectory.

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

1  2 
t/t6023-merge-file.sh patch | diff1 | diff2 | blob | history

diff --cc t/t6023-merge-file.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.