diff options
| author | Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | 043622b2e9fd7b5e4b07404c4896080a602cc139 (patch) | |
| tree | 07dbdb6980f1dd63b3543a2e11a8656710fb1c33 /commit.c | |
| parent | 93a02c5553a293aa0ae34293304332dbc0fee431 (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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions