Mercurial > hg > mercurial-crew-with-dirclash

diff 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
line wrap: on
line diff
--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -11,7 +11,7 @@ merging file1 failed!
 diff -r f4d7a8c73d23 file1
 --- a/file1
 +++ b/file1
-@@ -1,3 +1,7 @@
+@@ -1,3 +1,7 @@ added file1
  added file1
  another line of text
 +<<<<<<<