--- a/tests/test-conflict Thu Apr 26 23:58:18 2007 -0700 +++ b/tests/test-conflict Sat Apr 28 17:55:45 2007 -0300 @@ -11,5 +11,5 @@ hg commit -m branch2 -d "1000000 0" hg merge 1 hg id -egrep -v ">>>|<<<" a +cat a hg status