diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 13:13:11 -0800 |
| commit | 33367575b85a115900deac600cc4f8f03ec4754b (patch) | |
| tree | 1bf8567d605c6265bd5d1f43d9bafcf80aac54d4 /contrib/remote-helpers/test-hg-hg-git.sh | |
| parent | 3630be2749819b79de917a77c6627e3f84c00a11 (diff) | |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 (diff) | |
| download | git-33367575b85a115900deac600cc4f8f03ec4754b.tar.gz | |
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
Diffstat (limited to 'contrib/remote-helpers/test-hg-hg-git.sh')
0 files changed, 0 insertions, 0 deletions