Mercurial > hg > mercurial-crew-with-dirclash

diff 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
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
 +<<<<<<<