Mercurial > hg

diff tests/test-merge5.t @ 45840:527ce85c2e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: introduce StateError and use it from commands and cmdutil This very similar to an earlier patch (which was for `InputError`). In this patch, I also updated the transplant extension only because `test-transplant.t` would otherwise have needed a `#if continueflag`. Differential Revision: https://phab.mercurial-scm.org/D9310
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 12 Oct 2020 12:44:18 -0700
parents 6b1fc09c699a
children 55c6ebd11cb9
line wrap: on
line diff
--- a/tests/test-merge5.t	Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-merge5.t	Mon Oct 12 12:44:18 2020 -0700
@@ -16,7 +16,7 @@
   $ rm b
   $ hg update -c 2
   abort: uncommitted changes
-  [255]
+  [20]
   $ hg revert b
   $ hg update -c 2
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved