diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:18 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:01 -0700 |
| commit | e8eb99d4a6b2505c15a2be916d611f4e7f9cde2f (patch) | |
| tree | 9ce19d69a7ec74de241e06b9583dc2c232f3323d /object.c | |
| parent | t6422, t6426: be more flexible for add/add conflicts involving renames (diff) | |
| download | tgif-e8eb99d4a6b2505c15a2be916d611f4e7f9cde2f.tar.xz | |
t642[23]: be more flexible for add/add conflicts involving pair renames
Much like the last commit accepted 'add/add' and 'rename/add'
interchangably, we also want to do the same for 'add/add' and
'rename/rename'. This also allows us to avoid the ambiguity in meaning
with 'rename/rename' (is it two separate files renamed to the same
location, or one file renamed on both sides but differently)?
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions