--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -27,7 +27,7 @@ hg id
hg update -C 0
echo "changed file1 different" >> file1
hg update
-hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
+hg diff --nodates
hg status
hg id
hg revert --no-backup --all