mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
9d996cd13f
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
8 lines
160 B
Plaintext
8 lines
160 B
Plaintext
Checking encoding (ascii)...
|
|
Checking extensions...
|
|
Checking templates...
|
|
Checking patch...
|
|
Checking commit editor...
|
|
Checking username...
|
|
No problems detected
|