merge-recursive: set paths correctly when three-way merging content
authorElijah Newren <newren@gmail.com>
Wed, 19 Sep 2018 16:14:31 +0000 (09:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Sep 2018 19:33:57 +0000 (12:33 -0700)
commit52396e1...3dd1417f042aa5269399bdcffe0a6c66
tree144421a...c6304d6f1b2f5a4be070420f368c7676copy hash to clipboard (tree)
parent2d3b1c5...6c85b7f5db1f418907af00ab88e0c303copy hash to clipboard (diff)
merge-recursive.c