Mercurial > public > mercurial-scm > hg
diff tests/test-merge9 @ 8167:6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 26 Apr 2009 14:29:02 +0200 |
parents | 30cb79d84352 |
children |
line wrap: on
line diff
--- 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