Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6009
filemerge: remove the hgmerge script
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6008
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6007
filemerge: add config item for GUI tools
<tool>.gui indicates whether a tool requires a GUI to run
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6006
merge: add registry look up bits to tool search
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6005
merge: add support for tool EOL fixups
specified with merge-tools:<tool>.fixeol=True
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6004
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