merge-recursive: use 'ci' for rename_conflict_info variable name
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:16 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit043622b...e9fd7b5e4b07404c4896080a602cc139
tree07dbdb6...80f1dd63b3543a2e11a8656710fb1c33copy hash to clipboard (tree)
parent93a02c5...53a293aa0ae34293304332dbc0fee431copy hash to clipboard (diff)
merge-recursive.c