Mercurial > public > mercurial-scm > hg
diff tests/test-convert-svn-sink.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 | 180a3eee4b75 |
| children | 4b0c9c674707 |
line wrap: on
line diff
--- a/tests/test-convert-svn-sink.out Sun Feb 03 19:29:05 2008 -0600 +++ b/tests/test-convert-svn-sink.out Sun Feb 03 19:29:05 2008 -0600 @@ -260,8 +260,8 @@ adding right-1 adding right-2 3 files updated, 0 files merged, 2 files removed, 0 files unresolved +merging b warning: conflicts during merge. -merging b merging b failed! 2 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: