equal
deleted
inserted
replaced
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 |
14 |
15 * `hg copy --forget` can be used to unmark a file as copied. |
15 * `hg copy --forget` can be used to unmark a file as copied. |
|
16 |
|
17 * The `format.revlog-compression` configuration entry now accept a list. The |
|
18 first available option will be used. for example setting:: |
|
19 |
|
20 [format] |
|
21 revlog-compression=zstd, zlib |
|
22 |
|
23 Will use `zstd` compression for new repositories is available, and will |
|
24 simply fall back to `zlib` if not. |
16 |
25 |
17 == New Experimental Features == |
26 == New Experimental Features == |
18 |
27 |
19 * `hg copy` now supports a `--at-rev` argument to mark files as |
28 * `hg copy` now supports a `--at-rev` argument to mark files as |
20 copied in the specified commit. It only works with `--after` for |
29 copied in the specified commit. It only works with `--after` for |