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

     1

diff -r 3903775176ed b

     2

--- /dev/null

     3

+++ b/b

     4

@@ -0,0 +1,1 @@

     5

+123

     6

diff -r 3903775176ed b

     7

--- /dev/null

     8

+++ b/b

     9

@@ -0,0 +1,1 @@

    10

+123