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-flags.out
changeset 1922 6d50d6189269
parent 1043 9344f5dd4488
child 1933 7544700fd931 
--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -44,5 +44,7 @@ summary:     added a b
 resolving manifests
 merging a
 resolving a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 -rwxr-x---
 -rwxr-x---
mercurial-crew-with-dirclash