##// END OF EJS Templates
relnotes: add note about changed labels texts...
Martin von Zweigbergk -
r49440:b128d21c default
parent child Browse files
Show More
@@ -1,31 +1,36
1 1 == New Features ==
2 2
3 3
4 4 == Default Format Change ==
5 5
6 6 These changes affects newly created repositories (or new clone) done with
7 7 Mercurial XXX.
8 8
9 9
10 10 == New Experimental Features ==
11 11
12 12 == Bug Fixes ==
13 13
14 14 The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.
15 15
16 16 == Backwards Compatibility Changes ==
17 17
18 18 The remotefilelog extension now requires an appropiate excludepattern
19 19 for subrepositories.
20 20
21 21 The labels passed to merge tools have changed slightly. Merge tools can get
22 22 labels passed to them if you include `$labellocal`, `$labelbase`, and/or
23 23 `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
24 24 used to have some space-padding, and truncation to fit within 72 columns. Both
25 25 the padding and the truncation has been removed.
26 26
27 Some of the text in labels passed to merge tools has changed. For example,
28 in conflicts while running `hg histedit`, the labels used to be "local",
29 "base", and "histedit". They are now "already edited",
30 "parent of current change", and "current change", respectively.
31
27 32 == Internal API Changes ==
28 33
29 34 The following functions have been removed:
30 35
31 36 Miscellaneous:
General Comments 0
You need to be logged in to leave comments. Login now