simplemerge: make minimize() a free function
IMO, `Merge3Text` should be about merging text without knowing about
conflict markers. "Conflict minimization" is about making conflict
markers smaller, so it should be moved out. This patch does that. I'll
refactor it next.
Differential Revision: https://phab.mercurial-scm.org/D11980
== 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: