Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > builtin/merge.c | 4 -- This finds and re-fixes what has already been fixed in another topic, which is unfortunate, but it is minor. If this topic takes longer before en/merge-restore-to-pristine graduates, it may want to get rerolled to avoid duplication, but for now I'll queue the series as-is. Thanks.