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

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

tests: add `hg log -G` output when there are merge conflicts...
tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042
Martin von Zweigbergk - - Load All Authors

File last commit:

r44817:8561ad49 default
r44818:ab632e27 default
Show More
next
29 lines | 771 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
Martin von Zweigbergk
revset: add a revset for parents in merge state...
 r44817 * New `conflictlocal()` and `conflictother()` revsets returns the
commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`.
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.