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-rebase-conflicts.t
changeset 18935 e5d9441ec281
parent 18933 42b620fc89e2
child 19969 ad9db007656f 
--- a/tests/test-rebase-conflicts.t	Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-conflicts.t	Fri Feb 08 16:17:46 2013 -0600
@@ -66,7 +66,7 @@
   warning: conflicts during merge.
   merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
-  [255]
+  [1]
 
 Try to continue without solving the conflict:
mercurial