changeset 8167 | 6c82beaaa11a |
parent 7847 | 30cb79d84352 |
--- a/tests/test-merge9 Sun Apr 26 11:49:17 2009 +0200 +++ b/tests/test-merge9 Sun Apr 26 14:29:02 2009 +0200 @@ -8,18 +8,18 @@ echo foo > foo echo a > bar -hg ci -Am 'add foo' -d '0 0' +hg ci -Am 'add foo' hg mv foo baz echo b >> bar echo quux > quux1 -hg ci -Am 'mv foo baz' -d '0 0' +hg ci -Am 'mv foo baz' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 -hg ci -Am 'change foo' -d '0 0' +hg ci -Am 'change foo' # test with the rename on the remote side HGMERGE=false hg merge