Fix typeerror when specifying both --rebase and --pull
#!/bin/sh"$TESTDIR/hghave" symlink || exit 80hg init acd aecho '% directory moved and symlinked'mkdir footouch foo/ahg ci -Amamv foo barln -s bar fooecho '% now addremove should remove old files'hg addremove