equal
deleted
inserted
replaced
22 labels passed to them if you include `$labellocal`, `$labelbase`, and/or |
22 labels passed to them if you include `$labellocal`, `$labelbase`, and/or |
23 `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels |
23 `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels |
24 used to have some space-padding, and truncation to fit within 72 columns. Both |
24 used to have some space-padding, and truncation to fit within 72 columns. Both |
25 the padding and the truncation has been removed. |
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 == Internal API Changes == |
32 == Internal API Changes == |
28 |
33 |
29 The following functions have been removed: |
34 The following functions have been removed: |
30 |
35 |
31 Miscellaneous: |
36 Miscellaneous: |