diff tests/test-rename-merge1.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

--- a/tests/test-rename-merge1.out	Sun Feb 03 19:29:05 2008 -0600
+++ b/tests/test-rename-merge1.out	Sun Feb 03 19:29:05 2008 -0600
@@ -19,8 +19,10 @@
  a: remote moved to b -> m
  b2: remote created -> g
 copying a to b
+picked tool 'internal:merge' for a (binary False symlink False)
 merging a and b
 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
+ premerge successful
 removing a
 warning: detected divergent renames of a2 to:
  c2