Mercurial > hg > gitweb

diff tests/test-conflict @ 1925:c71420b186b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small solaris portability fixes from John Levon <levon@movementarian.org>
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 15:42:48 +0100
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line diff
--- a/tests/test-conflict	Tue Feb 21 22:32:17 2006 +0100
+++ b/tests/test-conflict	Wed Feb 22 15:42:48 2006 +0100
@@ -12,5 +12,5 @@
 HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
-grep -Ev ">>>|<<<" a
+egrep -v ">>>|<<<" a
 hg status