Mercurial > hg

diff tests/test-rebase-collapse.t @ 45877:ac362d5a7893

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: introduce CanceledError and use it in a few places This very similar to earlier patches (e.g. for `InputError`) and part of https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan. Differential Revision: https://phab.mercurial-scm.org/D9339
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 22 Oct 2020 14:14:59 -0700
parents b4694ef45db5
children 9989a276712f
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t	Tue Nov 17 15:51:09 2020 -0800
+++ b/tests/test-rebase-collapse.t	Thu Oct 22 14:14:59 2020 -0700
@@ -760,7 +760,7 @@
   already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
   rebasing 3:63668d570d21 C tip "C"
   abort: edit failed: false exited with status 1
-  [255]
+  [250]
   $ hg tglog
   o  3: 63668d570d21 'C'
   |