Mercurial > hg
diff tests/test-double-merge @ 5104:7706ff46ef45
The >| redirection does not exist in plain sh.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 02 Aug 2007 14:51:49 +0200 |
parents | f191bc3916f7 |
children | 50b6af595e0c |
line wrap: on
line diff
--- 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"