]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e9cd1b5) | patch
merge-recursive: remove ren[12]_other fields from rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:19 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commit3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08
treefa050f2764ca76e45f2145faaada0ea4ad356218tree | snapshot
parente9cd1b5ca4438769c369126f1d9f963fc93bb471commit | diff
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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.