Mercurial > hg > pyhgsh

view tests/test-merge-revert2.out @ 2051:6a03cff2b0f5 0.8.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to use /usr/bin/test or /bin/test to work around missing features. The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Fri, 07 Apr 2006 22:31:54 +0200
parents d436b21b20dc
children b2ae81a7df29
line wrap: on
line source

1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
9eca13a34789
9eca13a34789+
reverting file1
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
reverting file1
f248da0d4c3e tip
f248da0d4c3e tip
f248da0d4c3e tip