Tonfa: Yes, but I think the reasoning goes the other way:
No automated merge tool will do the right thing for both cases, so we _should_
disable (silent!) simplemerge by default.
Or slightly rephrased to emphasize my point: Simplemerge is good (and getting
better), but it shouldn't be silent by default.