changeset 2283 | e506c14382fd |
parent 2021 | fc22ed56afe3 |
child 3684 | 975c2469c316 |
--- a/tests/test-push-warn Sun May 14 17:37:34 2006 -0700 +++ b/tests/test-push-warn Sun May 14 21:07:34 2006 -0700 @@ -23,7 +23,7 @@ hg push ../a hg pull ../a hg push ../a -hg up -m +hg merge hg commit -m "4" -d "1000000 0" hg push ../a cd .. @@ -44,7 +44,7 @@ hg ci -m d-$i -d "1000000 0" done -HGMERGE=true hg co -m 3 +HGMERGE=true hg merge 3 hg ci -m c-d -d "1000000 0" hg push ../c