Mercurial > hg
comparison tests/test-issue672.out @ 6004:5af5f0f9d724
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
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Feb 2008 19:29:05 -0600 |
parents | 124577de40a7 |
children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
6003:7855b88ba838 | 6004:5af5f0f9d724 |
---|---|
26 1a | 26 1a |
27 all copies found (* = to merge, ! = divergent): | 27 all copies found (* = to merge, ! = divergent): |
28 1a -> 1 * | 28 1a -> 1 * |
29 checking for directory renames | 29 checking for directory renames |
30 1a: local moved to 1 -> m | 30 1a: local moved to 1 -> m |
31 picked tool 'internal:merge' for 1a (binary False symlink False) | |
31 merging 1a and 1 | 32 merging 1a and 1 |
32 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d | 33 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
34 premerge successful | |
33 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 35 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
34 (branch merge, don't forget to commit) | 36 (branch merge, don't forget to commit) |
35 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 37 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
36 resolving manifests | 38 resolving manifests |
37 overwrite None partial False | 39 overwrite None partial False |
42 all copies found (* = to merge, ! = divergent): | 44 all copies found (* = to merge, ! = divergent): |
43 1a -> 1 * | 45 1a -> 1 * |
44 checking for directory renames | 46 checking for directory renames |
45 1: remote moved to 1a -> m | 47 1: remote moved to 1a -> m |
46 copying 1 to 1a | 48 copying 1 to 1a |
49 picked tool 'internal:merge' for 1 (binary False symlink False) | |
47 merging 1 and 1a | 50 merging 1 and 1a |
48 my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d | 51 my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d |
52 premerge successful | |
49 removing 1 | 53 removing 1 |
50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 54 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
51 (branch merge, don't forget to commit) | 55 (branch merge, don't forget to commit) |