Mercurial > hg > mercurial-crew-with-dirclash
changeset 5166: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 | e5b21a549cc5 |
| children | 4dfe4c21dd64 64888ff907f4 |
| files | tests/test-double-merge |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-double-merge +++ b/tests/test-double-merge @@ -15,7 +15,7 @@ hg ci -m 'cp foo bar; change both' -d "1 # 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"