--- a/tests/test-mq-qnew.t Sun Jun 09 01:13:13 2019 +0530
+++ b/tests/test-mq-qnew.t Sun Jun 09 02:12:58 2019 +0530
@@ -164,7 +164,8 @@
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
(no more unresolved files)
- abort: cannot manage merge changesets
+ abort: outstanding uncommitted merge
+ (use 'hg commit' or 'hg merge --abort')
$ rm -r sandbox
hg headers
@@ -243,7 +244,8 @@
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
(no more unresolved files)
- abort: cannot manage merge changesets
+ abort: outstanding uncommitted merge
+ (use 'hg commit' or 'hg merge --abort')
$ rm -r sandbox
Test saving last-message.txt