Mercurial > hg-stable
comparison relnotes/next @ 44377:8561ad49915d
revset: add a revset for parents in merge state
This may be particularly useful soon, when I'm going to change how `hg
rebase` sets its parents during conflict resolution.
Differential Revision: https://phab.mercurial-scm.org/D8041
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Jan 2020 11:30:35 -0800 |
| parents | 9f8eddd2723f |
| children | 14d0e89520a2 |
comparison
equal
deleted
inserted
replaced
| 44376:7f7c8521e9bd | 44377:8561ad49915d |
|---|---|
| 1 == New Features == | 1 == New Features == |
| 2 | 2 |
| 3 * `hg purge`/`hg clean` can now delete ignored files instead of | 3 * `hg purge`/`hg clean` can now delete ignored files instead of |
| 4 untracked files, with the new -i flag. | 4 untracked files, with the new -i flag. |
| 5 | |
| 6 * New `conflictlocal()` and `conflictother()` revsets returns the | |
| 7 commits that are being merged, when there are conflicts. Also works | |
| 8 for conflicts caused by e.g. `hg graft`. | |
| 9 | |
| 5 | 10 |
| 6 == New Experimental Features == | 11 == New Experimental Features == |
| 7 | 12 |
| 8 | 13 |
| 9 == Bug Fixes == | 14 == Bug Fixes == |