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

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

Add -D/--nodates options to hg diff/export that removes dates from diff headers...
Add -D/--nodates options to hg diff/export that removes dates from diff headers and replace uses of sed in the tests with --nodates.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r3199:096f1c73 default
Show More
test-merge-revert2.out
34 lines | 871 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Annotation | Raw |Copy content |Copy permalink
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
merge: 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.
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
reverting file1
f248da0d4c3e tip
f248da0d4c3e tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f248da0d4c3e tip