Mercurial > evolve

diff tests/test-evolve-stop-orphan.t @ 4356:a71f2271ed76 mercurial-4.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with future version
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 10:46:02 -0500
parents 00bc03f56f37
children a2fdbece7ce1 63a816beee7e
line wrap: on
line diff
--- 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