##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Show reason why an ignore file can't be read and state that it is skipped.
Show reason why an ignore file can't be read and state that it is skipped.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default
r2006:ff8b39da default
Show More
test-merge-revert2.out
26 lines | 437 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Annotation | Raw |Copy content |Copy permalink
1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
9eca13a34789
9eca13a34789+
9eca13a34789
f248da0d4c3e tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@ added file1
added file1
another line of text
+<<<<<<<
+changed file1 different
+=======
changed file1
+>>>>>>>
M file1
f248da0d4c3e+ tip
f248da0d4c3e tip
f248da0d4c3e tip
f248da0d4c3e tip