test-remove: fix \ vs. / issues on Windows
This part of the test failed with
$ hg rm --after d1
- removing d1/a
+ removing d1\a
on Windows.
Test update logic when there are renames
Update with local changes across a file rename
$ hg init
$ echo a > a
$ hg add a
$ hg ci -m a
$ hg mv a b
$ hg ci -m rename
$ echo b > b
$ hg ci -m change
$ hg up -q 0
$ echo c > a
$ hg up
merging a and b to b
warning: conflicts during merge.
merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]