Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
#!/bin/sh
set -e
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify
hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"
cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest