equal
deleted
inserted
replaced
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 |
5 |
6 * New `conflictlocal()` and `conflictother()` revsets returns the |
6 * `hg log` now defaults to using an '%' symbol for commits involved |
|
7 in unresolved merge conflicts. That includes unresolved conflicts |
|
8 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes |
|
9 precedence, so what used to be marked '@' still is. |
|
10 |
|
11 * New `conflictlocal()` and `conflictother()` revsets return the |
7 commits that are being merged, when there are conflicts. Also works |
12 commits that are being merged, when there are conflicts. Also works |
8 for conflicts caused by e.g. `hg graft`. |
13 for conflicts caused by e.g. `hg graft`. |
9 |
14 |
10 |
15 |
11 == New Experimental Features == |
16 == New Experimental Features == |