Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert2 @ 953:52d8d81e72ad
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:45:25 -0800 |
parents | 01215ad04283 d997148155f2 |
children | 4f81068ed8cd |
line wrap: on
line diff
--- a/tests/test-merge-revert2 +++ b/tests/test-merge-revert2 @@ -27,7 +27,8 @@ hg id 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