24   user:        test

    24   user:        test

    25   date:        Thu Jan 01 00:00:00 1970 +0000

    25   date:        Thu Jan 01 00:00:00 1970 +0000

    26   summary:     cp foo bar; change both

    26   summary:     cp foo bar; change both

    27   

    27   

    28   $ hg merge --debug

    28   $ hg merge --debug

    30     unmatched files in other:

    29     unmatched files in other:

    31      bar

    30      bar

    32     all copies found (* = to merge, ! = divergent, % = renamed and deleted):

    31     all copies found (* = to merge, ! = divergent, % = renamed and deleted):

    33      src: 'foo' -> dst: 'bar' *

    32      src: 'foo' -> dst: 'bar' *

    34     checking for directory renames

    33     checking for directory renames