graphlog: use '%' for other context in merge conflict
This lets the user more easily find the commit that is involved in the
conflict, such as the source of `hg update -m` or the commit being
grafted by `hg graft`.
Differential Revision: https://phab.mercurial-scm.org/D8043
== New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag.
* `hg log` now defaults to using an '%' symbol for commits involved
in unresolved merge conflicts. That includes unresolved conflicts
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
precedence, so what used to be marked '@' still is.
* New `conflictlocal()` and `conflictother()` revsets return the
commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`.
== New Experimental Features ==
== Bug Fixes ==
== Backwards Compatibility Changes ==
== Internal API Changes ==
* The deprecated `ui.progress()` has now been deleted. Please use
`ui.makeprogress()` instead.
* `hg.merge()` has lost its `abort` argument. Please call
`hg.abortmerge()` directly instead.
* The `*others` argument of `cmdutil.check_incompatible_arguments()`
changed from being varargs argument to being a single collection.