Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-revert2.out @ 1637:3b1b44b917f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new bdiff based unidiff generation.
author mason@suse.com
date Tue, 24 Jan 2006 15:02:10 +1300
parents 5a034646e472
children 7544700fd931
comparison
equal deleted inserted replaced
1636:7da32bb3d1d3 1637:3b1b44b917f4
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 +=======