Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 1827:26dd4ae77b7b
get patchbomb extension to use demandload. speeds up hg startup by 50%.
author | Vadim Gelfer <vadim.gelger@gmail.com> |
---|---|
date | Thu, 02 Mar 2006 11:38:39 -0800 |
parents | 3b1b44b917f4 |
children | 7544700fd931 |
line wrap: on
line source
1:f4d7a8c73d23 0:232e179b3f29 f4d7a8c73d23 tip 232e179b3f29 232e179b3f29+ 232e179b3f29 f4d7a8c73d23 tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f4d7a8c73d23+ tip f4d7a8c73d23 tip f4d7a8c73d23 tip f4d7a8c73d23 tip