mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
ea7bd9ea6f
This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
27 lines
425 B
Plaintext
27 lines
425 B
Plaintext
1:f4d7a8c73d23
|
|
0:232e179b3f29
|
|
f4d7a8c73d23 tip
|
|
232e179b3f29
|
|
232e179b3f29+
|
|
232e179b3f29
|
|
f4d7a8c73d23 tip
|
|
merge: warning: conflicts during merge
|
|
merging file1
|
|
merging file1 failed!
|
|
diff -r f4d7a8c73d23 file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@
|
|
added file1
|
|
another line of text
|
|
+<<<<<<<
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>>
|
|
M file1
|
|
f4d7a8c73d23+ tip
|
|
f4d7a8c73d23 tip
|
|
f4d7a8c73d23 tip
|
|
f4d7a8c73d23 tip
|