changeset 3736 | ad3d5b4367cb |
parent 2283 | e506c14382fd |
child 4295 | a74586023196 |
--- a/tests/test-merge6 +++ b/tests/test-merge6 @@ -36,11 +36,11 @@ hg pull ../B1 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. -hg manifest +hg manifest --debug cd ../B2 hg pull ../A2 hg merge hg commit -m "commit test" -d "1000000 0" echo bar should remain deleted. -hg manifest +hg manifest --debug