simplemerge: use same newline detection for :mergediff as for :merge[3]
The `:merge` and `:merge3` markers used the newline style detected
from the base input. The `:mergediff` style always used LF as newline
character. This patch teaches `:mergediff` to use the same detection
as the others did.
Differential Revision: https://phab.mercurial-scm.org/D11976
== New Features ==
== Default Format Change ==
These changes affects newly created repositories (or new clone) done with
Mercurial XXX.
== New Experimental Features ==
== Bug Fixes ==
The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.
== Backwards Compatibility Changes ==
The remotefilelog extension now requires an appropiate excludepattern
for subrepositories.
== Internal API Changes ==
The following functions have been removed:
Miscellaneous: