merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
#!/bin/sh
hg init a
cd a
hg init b
echo x > b/x
echo '# should print nothing'
hg st
echo '# should print ? b/x'
hg st b/x
hg add b/x
echo '# should print A b/x'
hg st
echo '# should forget b/x'
hg revert --all
echo '# should print nothing'
hg st b