mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
11423d02c7
We'd mistakenly made the -p option always on, which meant there was no way to turn it off. It also meant that we were sometimes splitting multibyte characters in function name, which isn't a good default.
38 lines
925 B
Plaintext
38 lines
925 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
|
|
warning: conflicts during merge.
|
|
merging file1
|
|
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
|
|
+<<<<<<< my
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>> other
|
|
M file1
|
|
f248da0d4c3e+ tip
|
|
reverting file1
|
|
f248da0d4c3e tip
|
|
f248da0d4c3e tip
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
f248da0d4c3e tip
|