tests/test-double-merge
changeset 5057 99a4592ea886
parent 5042 f191bc3916f7
child 8387 50b6af595e0c
--- a/tests/test-double-merge	Thu Aug 02 14:04:51 2007 +0200
+++ b/tests/test-double-merge	Thu Aug 02 14:51:49 2007 +0200
@@ -15,7 +15,7 @@
 # in another branch, change foo in a way that doesn't conflict with
 # the other changes
 hg up -qC 0
-echo line 0 >| foo
+echo line 0 > foo
 hg cat foo >> foo
 hg ci -m 'change foo' -d "1000000 0"