--- a/tests/test-merge-revert2 Fri Sep 29 23:14:22 2006 +0200
+++ b/tests/test-merge-revert2 Tue Sep 26 00:05:24 2006 +0100
@@ -27,8 +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/" \
- -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
+#hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
+hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
hg status
hg id
hg revert --no-backup --all