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 45840 527ce85c2e60
parent 45826 21733e8c924f
child 45916 fa87536d3d70 
--- a/tests/test-rebase-conflicts.t	Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-rebase-conflicts.t	Mon Oct 12 12:44:18 2020 -0700
@@ -57,7 +57,7 @@
 
   $ hg rebase --continue
   abort: no rebase in progress
-  [255]
+  [20]
 
 Conflicting rebase:
mercurial