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-closedheads.t
changeset 12316 4134686b83e1
parent 12156 4c94b6d0fb1c
child 15615 41885892796e 
--- a/tests/test-merge-closedheads.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-merge-closedheads.t	Thu Sep 16 17:51:32 2010 -0500
@@ -44,6 +44,7 @@
   $ hg merge
   abort: branch 'default' has 3 heads - please merge with an explicit rev
   (run 'hg heads .' to see heads)
+  [255]
 
 close one of the heads
   $ hg up -C 6
mercurial