Mercurial > hg
comparison tests/test-conflict.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 | 93a4e72b4f83 |
children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
6003:7855b88ba838 | 6004:5af5f0f9d724 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2 merging a | |
2 warning: conflicts during merge. | 3 warning: conflicts during merge. |
3 merging a | |
4 merging a failed! | 4 merging a failed! |
5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
6 There are unresolved merges, you can redo the full merge using: | 6 There are unresolved merges, you can redo the full merge using: |
7 hg update -C 2 | 7 hg update -C 2 |
8 hg merge 1 | 8 hg merge 1 |
9 e7fe8eb3e180+0d24b7662d3e+ tip | 9 e7fe8eb3e180+0d24b7662d3e+ tip |
10 <<<<<<< my | 10 <<<<<<< local |
11 something else | 11 something else |
12 ======= | 12 ======= |
13 something | 13 something |
14 >>>>>>> other | 14 >>>>>>> other |
15 M a | 15 M a |
16 ? a.orig |