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-merge-types.t
changeset 17110 722fd97f6645
parent 16355 cb1475e7e5a2
child 18334 44bda93df90e 
--- a/tests/test-merge-types.t	Wed Jul 04 12:43:13 2012 +0200
+++ b/tests/test-merge-types.t	Thu Jul 05 00:35:42 2012 +0200
@@ -72,9 +72,11 @@
 
 Update to link without local change should get us a symlink (issue3316):
 
- $ hg up -C 0
- $ hg up
- $ hg st
+  $ hg up -C 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg up
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg st
 
 Update to link with local change should cause a merge prompt (issue3200):
mercurial