| commit | 33367575b85a115900deac600cc4f8f03ec4754b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2015 21:13:10 +0000 (5 13:13 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Mar 2015 21:13:11 +0000 (5 13:13 -0800) | ||
| tree | 1bf8567d605c6265bd5d1f43d9bafcf80aac54d4 | treesnapshot (tar.gz zip) |
| parent | 3630be2749819b79de917a77c6627e3f84c00a11 | commitdiff |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 | commitdiff |
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
"git merge-file" did not work correctly in a subdirectory.
* ab/merge-file-prefix:
merge-file: correctly open files when in a subdir
| t/t6023-merge-file.sh | diff1 | diff2 | blobhistory |