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
hg -q
hg help
hg -q help
hg add -h
hg add --skjdfks
hg help diff
hg help status
hg -q help status
hg help foo
hg skjdfks
exit 0