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-excessive-merge.out
changeset 2175 b2ae81a7df29
parent 2152 57729c56a23c
child 5405 8feb33c2d153 
--- a/tests/test-excessive-merge.out
+++ b/tests/test-excessive-merge.out
@@ -1,3 +1,9 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 changeset:   4:f6c172c6198c
 tag:         tip
 parent:      1:448a8c5e42f1
mercurial-crew-with-dirclash