FWIW, I agree that guessing a merge result is very hard. That is why I keep
insisting that real merges never should be silent. Thus I don't think the
unification of "identical" changes we see here is good; it hides a real "merge".

(With reference to issue1295)