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

resolving manifests

     2

 overwrite None partial False

     3

 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9

     4

  searching for copies back to rev 1

     5

  unmatched files in other:

     6

   bar

     7

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

     8

   bar -> foo *

     9

  checking for directory renames

    10

 foo: versions differ -> m

    11

 foo: remote copied to bar -> m

    12

copying foo to bar

    13

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

    14

merging foo and bar

    15

my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da

    16

 premerge successful

    17

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

    18

merging foo

    19

my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da

    20

 premerge successful

    21

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

    22

(branch merge, don't forget to commit)

    23

-- foo --

    24

line 0

    25

line 1

    26

line 2-1

    27

-- bar --

    28

line 0

    29

line 1

    30

line 2-2