diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:18 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | e9cd1b5ca4438769c369126f1d9f963fc93bb471 (patch) | |
| tree | 1a3d84613a249f169f99805d6a77f935150ed0a0 /alloc.h | |
| parent | merge-recursive: move some struct declarations together (diff) | |
| download | tgif-e9cd1b5ca4438769c369126f1d9f963fc93bb471.tar.xz | |
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>
Diffstat (limited to 'alloc.h')
0 files changed, 0 insertions, 0 deletions