merge-recursive: shrink rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:18 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commite9cd1b5...a4438769c369126f1d9f963fc93bb471
tree1a3d846...3a249f169f99805d6a77f935150ed0a0copy hash to clipboard (tree)
parent967d6be...25b10ac1ea39d50770b358166523fe22copy hash to clipboard (diff)
merge-recursive.c