file · d3j · tests/corpus/scenarios/move-loses-edit/expected.CONFLICT

d3j / tests / corpus / scenarios / move-loses-edit / expected.CONFLICT

overview tree log ※ main → 59967276

1

relabel-delete

File

lines 1

size 15 B

lang text

mode 100644

encoding ascii, lf

Last change

Conflict when one branch relabels what the other deleted

Alpha Chen 3 months ago

Actions

raw blame history

quire v2026-10-13T1631-09e473c