Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.out @ 1680:c21b54f7f7b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 01 Feb 2006 19:18:15 +0100
parents 3b1b44b917f4
children 7544700fd931
comparison
equal deleted inserted replaced
1679:675ca845c2f8 1680:c21b54f7f7b8
9 merging file1 9 merging file1
10 merging file1 failed! 10 merging file1 failed!
11 diff -r f4d7a8c73d23 file1 11 diff -r f4d7a8c73d23 file1
12 --- a/file1 12 --- a/file1
13 +++ b/file1 13 +++ b/file1
14 @@ -1,3 +1,7 @@ 14 @@ -1,3 +1,7 @@ added file1
15 added file1 15 added file1
16 another line of text 16 another line of text
17 +<<<<<<< 17 +<<<<<<<
18 +changed file1 different 18 +changed file1 different
19 +======= 19 +=======