author | Matt Mackall <mpm@selenic.com> |
Fri, 21 Apr 2006 16:30:49 -0500 | |
changeset 2111 | 2f3e644decd7 |
parent 2029 | d436b21b20dc |
child 2175 | b2ae81a7df29 |
permissions | -rw-r--r-- |
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