Mercurial > hg
diff tests/test-mq-qnew.t @ 42597:51e52a495214
mq: fix for merge detection methods
Differential Revision: https://phab.mercurial-scm.org/D6548
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Thu, 20 Jun 2019 01:08:56 +0530 |
parents | 12243f15d53e |
children | c6d31e659a28 |
line wrap: on
line diff
--- 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