Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 2149:43ce1c17e644
allow to pull from an empty repo without getting a backtrace
author | Vincent Danjean <vdanjean@free.fr> |
---|---|
date | Thu, 27 Apr 2006 22:29:02 -0700 |
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