Mercurial > hg
view tests/test-merge-revert2.out @ 2058:7e0dd64b0718
Use the new format of setting tags in view extension (Debian bug #361897)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 11 Apr 2006 12:44:13 +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