diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:20 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | c336ab859347036eb5d538a9bd741fb9a95da36a (patch) | |
| tree | de1dcb87977510fccc492a4ef2376dbd3261fa56 /alias.c | |
| parent | merge-recursive: remove ren[12]_other fields from rename_conflict_info (diff) | |
| download | tgif-c336ab859347036eb5d538a9bd741fb9a95da36a.tar.xz | |
merge-recursive: track branch where rename occurred in rename struct
We previously tracked the branch associated with a rename in a separate
field in rename_conflict_info, but since it is directly associated with
the rename it makes more sense to move it into the rename struct.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'alias.c')
0 files changed, 0 insertions, 0 deletions