author | Thomas Arendsen Hein <thomas@intevation.de> |
Thu, 02 Aug 2007 14:51:49 +0200 | |
changeset 5104 | 7706ff46ef45 |
parent 5103 | e5b21a549cc5 |
child 5105 | 64888ff907f4 |
child 5170 | 4dfe4c21dd64 |
--- 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"