diff tests/test-up-local-change @ 793:445970ccf57a

Merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 06:43:21 +0100
parents 7e4843b7efd2 6592c4f5cd4f
children ec85f9e6f3b1
line wrap: on
line diff
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -13,7 +13,7 @@ cd ../r2
 hg up
 echo abc > a
 hg diff > ../d
-sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
+sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
 
 cd ../r1
 echo b > b
@@ -29,5 +29,5 @@ hg --debug up -m
 hg parents
 hg -v history
 hg diff > ../d
-sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
+sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d