Mercurial > evolve

changeset 5749:0095a5240db5 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: back out changeset a4e50b74747e
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 28 Jan 2021 18:48:37 +0800
parents 860f72732052
children ded843f23065
files tests/test-evolve-issue5966.t tests/test-unstability-resolution-result.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-issue5966.t	Thu Jan 28 18:48:37 2021 +0800
+++ b/tests/test-evolve-issue5966.t	Thu Jan 28 18:48:37 2021 +0800
@@ -73,13 +73,13 @@
   U a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
 
 (even when ran twice)
 
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
 
   $ cat a
   apricot
--- a/tests/test-unstability-resolution-result.t	Thu Jan 28 18:48:37 2021 +0800
+++ b/tests/test-unstability-resolution-result.t	Thu Jan 28 18:48:37 2021 +0800
@@ -104,7 +104,7 @@
   +newer a
   $ hg evolve --continue
   abort: unresolved merge conflicts (see 'hg help resolve')
-  [20]
+  [255]
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg evolve --continue