tests/test-conflict
changeset 1925 c71420b186b0
parent 814 0902ffece4b4
child 1933 7544700fd931
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -12,5 +12,5 @@ hg commit -m branch2 -d "0 0"
 HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
-grep -Ev ">>>|<<<" a
+egrep -v ">>>|<<<" a
 hg status