]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 967d6be) | patch
merge-recursive: shrink rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 5 Apr 2019 15:00:18 +0000 (08:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Apr 2019 07:02:07 +0000 (16:02 +0900)
commite9cd1b5ca4438769c369126f1d9f963fc93bb471
tree1a3d84613a249f169f99805d6a77f935150ed0a0tree | snapshot
parent967d6be725b10ac1ea39d50770b358166523fe22commit | diff
merge-recursive: shrink rename_conflict_info

The rename_conflict_info struct used both a pair and a stage_data which
were taken from a rename struct.  Just use the original rename struct.
This will also allow us to start making other simplifications to the
code.

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.