Mercurial > public > mercurial-scm > hg

diff tests/test-resolve.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 527ce85c2e60
children 0c95b59a89f1
line wrap: on
line diff
--- a/tests/test-resolve.t	Tue Nov 17 15:51:09 2020 -0800
+++ b/tests/test-resolve.t	Thu Oct 22 14:14:59 2020 -0700
@@ -495,7 +495,7 @@
   > EOF
   re-merge all unresolved files (yn)? n
   abort: user quit
-  [255]
+  [250]
 
   $ hg resolve --all << EOF
   > y
@@ -523,7 +523,7 @@
   > EOF
   mark all unresolved files as resolved (yn)? n
   abort: user quit
-  [255]
+  [250]
 
   $ hg resolve -m << EOF
   > y
@@ -551,7 +551,7 @@
   > EOF
   mark all resolved files as unresolved (yn)? n
   abort: user quit
-  [255]
+  [250]
 
   $ hg resolve -m << EOF
   > y