Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict
changeset 392 ee4c80d294e5
parent 346 f69a5d2d4fe1
child 544 3d4d5f2aba9a
child 547 4fc63e22b1fe 
--- a/tests/test-conflict	Fri Jun 17 08:50:11 2005 -0800
+++ b/tests/test-conflict	Fri Jun 17 08:50:55 2005 -0800
@@ -13,5 +13,5 @@
 export HGMERGE=merge
 hg -d up -m 1
 hg id
-cat a | grep -v ">>>" | grep -v "<<<"
+grep -Ev ">>>|<<<" a
 hg status
Mercurial