Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-revert2.out
changeset 1637 3b1b44b917f4
parent 925 5a034646e472
child 1933 7544700fd931 
--- 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
 +<<<<<<<
mercurial-crew-with-dirclash