Mercurial > hg

diff tests/test-histedit-merge-tools.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 5effb1992c17
children
line wrap: on
line diff
--- a/tests/test-histedit-merge-tools.t	Thu Oct 22 13:31:34 2020 -0700
+++ b/tests/test-histedit-merge-tools.t	Mon Oct 12 12:44:18 2020 -0700
@@ -60,7 +60,7 @@
   7181f42b8fca: skipping changeset (no changes)
   $ hg histedit --abort
   abort: no histedit in progress
-  [255]
+  [20]
   $ cd ..
 
 Test legacy config name