Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 1971:915b81a35e46
imported patch /home/thomas/fix-incoming-abortion4.patch
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 18 Mar 2006 09:13:27 +0100 |
parents | 7544700fd931 |
children | d436b21b20dc |
line wrap: on
line source
1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip 9eca13a34789 9eca13a34789+ 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 f248da0d4c3e tip f248da0d4c3e tip f248da0d4c3e tip