Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
6003:7855b88ba838 | 6004:5af5f0f9d724 |
---|---|
258 adding left-2 | 258 adding left-2 |
259 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 259 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
260 adding right-1 | 260 adding right-1 |
261 adding right-2 | 261 adding right-2 |
262 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | 262 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
263 merging b | |
263 warning: conflicts during merge. | 264 warning: conflicts during merge. |
264 merging b | |
265 merging b failed! | 265 merging b failed! |
266 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 266 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
267 There are unresolved merges, you can redo the full merge using: | 267 There are unresolved merges, you can redo the full merge using: |
268 hg update -C 2 | 268 hg update -C 2 |
269 hg merge 4 | 269 hg merge 4 |