git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93a02c5)
merge-recursive: use 'ci' for rename_conflict_info variable name
authorElijah Newren <redacted>
Fri, 5 Apr 2019 15:00:16 +0000 (08:00 -0700)
committerJunio C Hamano <redacted>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit043622b2e9fd7b5e4b07404c4896080a602cc139
tree07dbdb6980f1dd63b3543a2e11a8656710fb1c33tree | snapshot
parent93a02c5553a293aa0ae34293304332dbc0fee431commit | diff
merge-recursive: use 'ci' for rename_conflict_info variable name

We used a couple different names, but used 'ci' the most.  Use the same
variable name throughout for a little extra consistency.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT