Mercurial > hg

diff tests/test-resolve.t @ 23025:b8dd8432395d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve.t: use redirection to /dev/null instead of grep -q
author Augie Fackler <raf@durin42.com>
date Fri, 17 Oct 2014 11:01:05 -0400
parents ec36969497de
children 18af6ebd4001
line wrap: on
line diff
--- a/tests/test-resolve.t	Wed Oct 08 22:30:04 2014 -0700
+++ b/tests/test-resolve.t	Fri Oct 17 11:01:05 2014 -0400
@@ -118,8 +118,8 @@
   warning: conflicts during merge.
   merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
-  $ grep -q '<<<' file1
-  $ grep -q '<<<' file2
+  $ grep '<<<' file1 > /dev/null
+  $ grep '<<<' file2 > /dev/null
 
 resolve <file> should re-merge file
   $ echo resolved > file1
@@ -127,7 +127,7 @@
   warning: conflicts during merge.
   merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
-  $ grep -q '<<<' file1
+  $ grep '<<<' file1 > /dev/null
 
 resolve <file> should do nothing if 'file' was marked resolved
   $ echo resolved > file1