# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1186059109 -7200
# Node ID 7706ff46ef4590ac802c9896071c7954bd421957
# Parent  e5b21a549cc571af57b1341fb4b15242dee478bc
The >| redirection does not exist in plain sh.

diff -r e5b21a549cc5 -r 7706ff46ef45 tests/test-double-merge
--- a/tests/test-double-merge	Tue Aug 14 19:25:49 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"