Mercurial > hg
comparison tests/test-merge9.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 | f191bc3916f7 |
| children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
| 6003:7855b88ba838 | 6004:5af5f0f9d724 |
|---|---|
| 3 adding quux1 | 3 adding quux1 |
| 4 adding quux2 | 4 adding quux2 |
| 5 merging bar | 5 merging bar |
| 6 merging bar failed! | 6 merging bar failed! |
| 7 merging foo and baz | 7 merging foo and baz |
| 8 merging baz failed! | 8 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 9 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
| 10 There are unresolved merges, you can redo the full merge using: | 9 There are unresolved merges, you can redo the full merge using: |
| 11 hg update -C 2 | 10 hg update -C 2 |
| 12 hg merge 1 | 11 hg merge 1 |
| 13 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | 12 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 14 merging bar | 13 merging bar |
| 15 merging bar failed! | 14 merging bar failed! |
| 16 merging baz and foo | 15 merging baz and foo |
| 17 merging baz failed! | 16 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 18 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
| 19 There are unresolved merges, you can redo the full merge using: | 17 There are unresolved merges, you can redo the full merge using: |
| 20 hg update -C 1 | 18 hg update -C 1 |
| 21 hg merge 2 | 19 hg merge 2 |