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
42 lines
980 B
Plaintext
42 lines
980 B
Plaintext
1:f248da0d4c3e
|
|
0:9eca13a34789
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
9eca13a34789
|
|
9eca13a34789+
|
|
reverting file1
|
|
9eca13a34789
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
merging file1
|
|
warning: conflicts during merge.
|
|
merging file1 failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
There are unresolved merges with locally modified files.
|
|
You can redo the full merge using:
|
|
hg update 0
|
|
hg update 1
|
|
diff -r f248da0d4c3e file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@
|
|
added file1
|
|
another line of text
|
|
+<<<<<<< local
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>> other
|
|
M file1
|
|
? file1.orig
|
|
f248da0d4c3e+ tip
|
|
reverting file1
|
|
? file1.orig
|
|
f248da0d4c3e tip
|
|
? file1.orig
|
|
f248da0d4c3e tip
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
? file1.orig
|
|
f248da0d4c3e tip
|