Mercurial > hg
view tests/test-merge-revert2.out @ 3918:a413f5c29c46
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Dec 2006 23:24:30 +0100 |
parents | ad6f34c83c3d |
children | 46280c004f22 |
line wrap: on
line source
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. You can redo the full merge using: hg update 0 hg update 1 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