Andrew's git / gitweb.git / diff
?
Merge branch 'ab/merge-file-prefix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:25 +0000 (12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:25 +0000 (12:28 -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 
builtin/merge-file.c patch | diff1 | diff2 | blob | history
t/t6023-merge-file.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/merge-file.c
Simple merge
diff --cc t/t6023-merge-file.sh
Simple merge