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
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
ls
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg co 0
# B should disappear
ls