changeset 953 | 52d8d81e72ad |
parent 896 | 01215ad04283 |
parent 949 | d997148155f2 |
child 981 | 4f81068ed8cd |
--- 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