merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

     1

1 files updated, 0 files merged, 2 files removed, 0 files unresolved

     2

resolving manifests

     3

 overwrite None partial False

     4

 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0

     5

  searching for copies back to rev 1

     6

  unmatched files in other:

     7

   b

     8

   c

     9

  all copies found (* = to merge, ! = divergent):

    10

   c -> a *

    11

   b -> a *

    12

  checking for directory renames

    13

 a: remote moved to c -> m

    14

 a: remote moved to b -> m

    15

copying a to b

    16

copying a to c

    17

picked tool 'internal:merge' for a (binary False symlink False)

    18

merging a and b

    19

my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052

    20

 premerge successful

    21

removing a

    22

picked tool 'internal:merge' for a (binary False symlink False)

    23

merging a and c

    24

my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052

    25

 premerge successful

    26

0 files updated, 2 files merged, 0 files removed, 0 files unresolved

    27

(branch merge, don't forget to commit)

    28

-- b --

    29

0

    30

1

    31

2

    32

-- c --

    33

0

    34

1

    35

2