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 /git-merge-one-file.sh | |
| parent | Merge branch 'ps/submodule-sanitize-path-upon-add' into maint (diff) | |
| parent | merge-file: correctly open files when in a subdir (diff) | |
| download | tgif-33367575b85a115900deac600cc4f8f03ec4754b.tar.xz | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions