diff -r ffb0665028f0 -r 52d8d81e72ad tests/test-merge-revert2
--- a/tests/test-merge-revert2	Fri Aug 19 16:43:30 2005 -0800
+++ b/tests/test-merge-revert2	Fri Aug 19 16:45:25 2005 -0800
@@ -27,7 +27,8 @@
 hg update -C 0
 echo "changed file1 different" >> file1
 HGMERGE=merge hg update
-hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
+hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \
+              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
 hg status
 hg id
 hg revert