Mercurial > hg
comparison tests/test-add.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 | 883d887c6408 |
children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
6003:7855b88ba838 | 6004:5af5f0f9d724 |
---|---|
11 A a | 11 A a |
12 A b | 12 A b |
13 % should fail | 13 % should fail |
14 a already tracked! | 14 a already tracked! |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 merging a | |
16 warning: conflicts during merge. | 17 warning: conflicts during merge. |
17 merging a | |
18 merging a failed! | 18 merging a failed! |
19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
20 There are unresolved merges, you can redo the full merge using: | 20 There are unresolved merges, you can redo the full merge using: |
21 hg update -C 2 | 21 hg update -C 2 |
22 hg merge 1 | 22 hg merge 1 |
23 M a | 23 M a |
24 ? a.orig | |
24 % should fail | 25 % should fail |
25 a already tracked! | 26 a already tracked! |
26 M a | 27 M a |
28 ? a.orig | |
27 % issue683 | 29 % issue683 |
28 R a | 30 R a |
31 ? a.orig | |
29 M a | 32 M a |
33 ? a.orig | |
30 c does not exist! | 34 c does not exist! |
31 d does not exist! | 35 d does not exist! |
32 M a | 36 M a |
33 A c | 37 A c |
38 ? a.orig |