equal
deleted
inserted
replaced
31 be set as the value for the `merge` config in the `[ui]` |
31 be set as the value for the `merge` config in the `[ui]` |
32 section). It resolves merges the same was as `internal:merge` and |
32 section). It resolves merges the same was as `internal:merge` and |
33 `internal:merge3`, but it shows conflicts differently. Instead of |
33 `internal:merge3`, but it shows conflicts differently. Instead of |
34 showing 2 or 3 snapshots of the conflicting pieces of code, it |
34 showing 2 or 3 snapshots of the conflicting pieces of code, it |
35 shows one snapshot and a diff. This may be useful when at least one |
35 shows one snapshot and a diff. This may be useful when at least one |
36 side of the conflict is similar to the base. |
36 side of the conflict is similar to the base. The new marker style |
|
37 is also supported by "premerge" as |
|
38 `merge-tools.<tool>.premerge=keep-mergediff`. |
37 |
39 |
38 == New Experimental Features == |
40 == New Experimental Features == |
39 |
41 |
40 * `experimental.single-head-per-branch:public-changes-only` can be used |
42 * `experimental.single-head-per-branch:public-changes-only` can be used |
41 restrict the single head check to public revision. This is useful for |
43 restrict the single head check to public revision. This is useful for |