Although it seems unlikely to me that someone would depend on the old
behavior the introduction of 'hg --config ui.merge=internal:merge' is
backwards incompatible and version numbers are cheap, so bumping :-P.