1   $ mkdir t

     2   $ cd t

     3   $ hg init

     4 

     5   $ echo 1 > a

     6   $ hg ci -qAm "first" -d "1000000 0"

     7 

     8   $ hg cp a b

     9   $ hg mv a c

    10   $ echo 2 >> b

    11   $ echo 2 >> c

    12 

    13   $ hg ci -qAm "second" -d "1000000 0"

    14 

    15   $ hg co -C 0

    16   1 files updated, 0 files merged, 2 files removed, 0 files unresolved

    17 

    18   $ echo 0 > a

    19   $ echo 1 >> a

    20 

    21   $ hg ci -qAm "other" -d "1000000 0"

    22 

    23   $ hg merge --debug

    24     searching for copies back to rev 1

    25     unmatched files in other:

    26      b

    27      c

    28     all copies found (* = to merge, ! = divergent):

    29      c -> a *

    30      b -> a *

    31     checking for directory renames

    32   resolving manifests

    33    overwrite None partial False

    34    ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659

    35    a: remote moved to c -> m

    36    a: remote moved to b -> m

    37   preserving a for resolve of b

    38   preserving a for resolve of c

    39   removing a

    40   updating: a 1/2 files (50.00%)

    41   picked tool 'internal:merge' for b (binary False symlink False)

    42   merging a and b to b

    43   my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052

    44    premerge successful

    45   updating: a 2/2 files (100.00%)

    46   picked tool 'internal:merge' for c (binary False symlink False)

    47   merging a and c to c

    48   my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052

    49    premerge successful

    50   0 files updated, 2 files merged, 0 files removed, 0 files unresolved

    51   (branch merge, don't forget to commit)

    52 

    53 file b

    54   $ cat b

    55   0

    56   1

    57   2

    58 

    59 file c

    60   $ cat c

    61   0

    62   1

    63   2