Mercurial Mercurial > hg / 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-merge5.t
changeset 28029 72072cfc7e91
parent 23026 fe80fdf68ba7
child 28065 6b1fc09c699a 
--- a/tests/test-merge5.t	Wed Feb 03 04:37:04 2016 +0000
+++ b/tests/test-merge5.t	Tue Feb 02 14:49:02 2016 +0000
@@ -24,6 +24,7 @@
   $ hg revert b
   $ hg update -c
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 other heads for branch "default"
   $ mv a c
 
 Should abort:
Mercurial