Mercurial > hg
diff tests/test-double-merge @ 5148:06154aff2b1a
merge with -stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 08 Aug 2007 23:00:01 +0200 |
| parents | 99a4592ea886 |
| children | 50b6af595e0c |
line wrap: on
line diff
--- a/tests/test-double-merge Wed Aug 08 22:47:30 2007 +0200 +++ b/tests/test-double-merge Wed Aug 08 23:00:01 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"