]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 073bb8e 204a8ff)
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)
commitf11f76b2bbcd23fe403744c055456a0bdf0981e7
treebbcf114146443e2f5d5d79ec8ed5ce160e5aab8atree | snapshot
parent073bb8ebb8f6213080162ac5632ba853d2e8ccebcommit | diff
parent204a8ffe67d2b789a34a14a06618a24756f7d9a9commit | diff
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
builtin/merge-file.c diff1 | diff2 | blob | history
t/t6023-merge-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.