equal
deleted
inserted
replaced
9 precedence, so what used to be marked '@' still is. |
9 precedence, so what used to be marked '@' still is. |
10 |
10 |
11 * New `conflictlocal()` and `conflictother()` revsets return the |
11 * New `conflictlocal()` and `conflictother()` revsets return the |
12 commits that are being merged, when there are conflicts. Also works |
12 commits that are being merged, when there are conflicts. Also works |
13 for conflicts caused by e.g. `hg graft`. |
13 for conflicts caused by e.g. `hg graft`. |
|
14 |
|
15 * `hg copy --forget` can be used to unmark a file as copied. |
14 |
16 |
15 |
17 |
16 == New Experimental Features == |
18 == New Experimental Features == |
17 |
19 |
18 |
20 |