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

#!/bin/sh

     2

     3

hg init

     4

echo This is file a1 > a

     5

hg add a

     6

hg commit -m "commit #0" -d "0 0"

     7

touch b

     8

hg add b

     9

rm b

    10

hg commit -A -m"comment #1" -d "0 0"