branch | mercurial-4.8 |
changeset 4356 | a71f2271ed76 |
parent 4288 | 00bc03f56f37 |
child 4363 | a2fdbece7ce1 |
child 4671 | 63a816beee7e |
--- a/tests/test-evolve-stop-orphan.t Tue Jan 22 10:43:44 2019 -0500 +++ b/tests/test-evolve-stop-orphan.t Tue Jan 22 10:46:02 2019 -0500 @@ -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