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

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

tests: add test of rebase with conflict in merge commit...
tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824
Valentin Gatien-Baron - - Load All Authors

File last commit:

r44771:9f8eddd2 default
r44816:7f7c8521 default
Show More
next
24 lines | 587 B | text/plain | TextLexer
/ relnotes / next
History | Source | Raw |Copy content |Copy permalink
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
 r42457 == New Features ==
Valentin Gatien-Baron
purge: add -i flag to delete ignored files instead of untracked files...
 r44771 * `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag.
Martin von Zweigbergk
log: add config for making `hg log -G` always topo-sorted...
 r42500
== New Experimental Features ==
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
 r42457 == Bug Fixes ==
== Backwards Compatibility Changes ==
Martin von Zweigbergk
narrow: don't hexify paths and double-hexify known nodes on wire (BC)...
 r43214
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
 r42457 == Internal API Changes ==
Martin von Zweigbergk
progress: delete deprecated ui.progress()...
 r44619 * The deprecated `ui.progress()` has now been deleted. Please use
`ui.makeprogress()` instead.
Martin von Zweigbergk
merge: drop now-unused "abort" argument from hg.merge()...
 r44639
* `hg.merge()` has lost its `abort` argument. Please call
`hg.abortmerge()` directly instead.
Martin von Zweigbergk
cmdutil: change check_incompatible_arguments() *arg to single iterable...
 r44655
* The `*others` argument of `cmdutil.check_incompatible_arguments()`
changed from being varargs argument to being a single collection.