merge-recursive: remove ren[12]_other fields from rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:19 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit3f9c92e...99222515c6ebac1dc12d0bc3a6d4ae08
treefa050f2...64ca76e45f2145faaada0ea4ad356218copy hash to clipboard (tree)
parente9cd1b5...a4438769c369126f1d9f963fc93bb471copy hash to clipboard (diff)
merge-recursive.c