merge-recursive: switch from (oid,mode) pairs to a diff_filespec
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:22 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit8daec1d...03de7db13d5d551a8b54f32fc6021132
treeb1d0515...59a2999e240984f21149f89de15229efcopy hash to clipboard (tree)
parente2d563d...a9951683a118e728dee99bd07a90e52dcopy hash to clipboard (diff)
merge-recursive.c