--- a/tests/test-mq-qnew.t Tue Jul 09 00:03:10 2019 -0700
+++ b/tests/test-mq-qnew.t Thu Jun 20 01:08:56 2019 +0530
@@ -164,8 +164,7 @@
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: outstanding uncommitted merge
- (use 'hg commit' or 'hg merge --abort')
+ abort: cannot manage merge changesets
$ rm -r sandbox
hg headers
@@ -244,8 +243,7 @@
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: outstanding uncommitted merge
- (use 'hg commit' or 'hg merge --abort')
+ abort: cannot manage merge changesets
$ rm -r sandbox
Test saving last-message.txt