Mercurial Mercurial > mercurial / 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-merge1.out
changeset 2973 a31557193f3c
parent 2175 b2ae81a7df29
child 3311 966632304dde
child 3330 49966b5ab16f 
--- a/tests/test-merge1.out	Tue Aug 22 16:47:27 2006 -0500
+++ b/tests/test-merge1.out	Tue Aug 22 17:08:38 2006 -0500
@@ -1,6 +1,8 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% no merges expected
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+merging for b
+merging b
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail
mercurial