##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: work with `simplemerge.MergeInput` in `filemerge()`...
filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017
Joerg Sonnenberger - - Load All Authors

File last commit:

r49381:28f0092e default
r49431:07069fcd default
Show More
next
25 lines | 510 B | text/plain | TextLexer
/ relnotes / next
History | Annotation | Raw |Copy content |Copy permalink
== 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: