diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:19 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08 (patch) | |
| tree | fa050f2764ca76e45f2145faaada0ea4ad356218 /mergetools | |
| parent | merge-recursive: shrink rename_conflict_info (diff) | |
| download | tgif-3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08.tar.xz | |
merge-recursive: remove ren[12]_other fields from rename_conflict_info
The ren1_other and ren2_other fields were synthesized from information
in ren1->src_entry and ren2->src_entry. Since we already have the
necessary information in ren1 and ren2, just use those.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions