changeset 4267 | 18ed2a237ab5 |
parent 4122 | 4eb3877540f1 |
child 4288 | 00bc03f56f37 |
--- a/tests/test-evolve-stop-orphan.t Wed Nov 21 10:47:07 2018 +0000 +++ b/tests/test-evolve-stop-orphan.t Wed Nov 21 11:13:21 2018 +0000 @@ -109,9 +109,8 @@ Checking working dir $ hg status Checking for incomplete mergestate - $ ls .hg/merge - ls: cannot access .?\.hg/merge.?: No such file or directory (re) - [2] + $ ls .hg/ | grep merge + [1] Checking graph $ hg glog