| commit | f11f76b2bbcd23fe403744c055456a0bdf0981e7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Feb 2015 20:28:25 +0000 (22 12:28 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Feb 2015 20:28:25 +0000 (22 12:28 -0800) | ||
| tree | bbcf114146443e2f5d5d79ec8ed5ce160e5aab8a | treesnapshot (tar.gz zip) |
| parent | 073bb8ebb8f6213080162ac5632ba853d2e8cceb | commitdiff |
| parent | 204a8ffe67d2b789a34a14a06618a24756f7d9a9 | commitdiff |
Merge branch 'ab/merge-file-prefix'
"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
| builtin/merge-file.c | diff1 | diff2 | blobhistory |
| t/t6023-merge-file.sh | diff1 | diff2 | blobhistory |