Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert2.out @ 1357:94586af53d2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replacing select.select() with os.fstat() which works also on windows.
author zbynek@alex.kolej.mff.cuni.cz
date Tue, 27 Sep 2005 15:01:49 -0700
parents 5a034646e472
children 3b1b44b917f4
line wrap: on
line source

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