Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.

     1

+ hg init

     2

+ hg add a

     3

+ hg commit -m ancestor -d 0 0

     4

+ hg commit -m branch1 -d 0 0

     5

+ hg co 0

     6

+ hg commit -m branch2 -d 0 0

     7

+ hg up -m 1

     8

merge: warning: conflicts during merge

     9

merging a

    10

merging a failed!

    11

+ hg id

    12

32e80765d7fe+75234512624c+ tip

    13

something else

    14

=======

    15

something

    16

+ hg status

    17

M a