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 45916 fa87536d3d70
parent 45840 527ce85c2e60
child 46372 3e91d9978bec
child 46679 d6fa9fbd375d 
--- a/tests/test-rebase-conflicts.t	Mon Nov 23 16:20:02 2020 -0800
+++ b/tests/test-rebase-conflicts.t	Mon Nov 23 16:48:13 2020 -0800
@@ -89,7 +89,7 @@
 
   $ hg rebase --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [255]
+  [20]
 
 Conclude rebase:
mercurial