Am 13.11.24 um 00:01 schrieb Junio C Hamano: > With an explicit comma > in between 1 and base, would we end up with > > -1, --base, -2, --ours, -3, --theirs > > which may be worse than what we have currently? Agreed, that would indeed be worse. -- Hannes