tests/test-copy-move-merge.t
changeset 42209 91a0bc50b288
parent 39312 a3fd84f4fb38
child 42565 4764e8436b2a
equal deleted inserted replaced
42208:85f5934016f9 42209:91a0bc50b288
    21   $ echo 1 >> a
    21   $ echo 1 >> a
    22 
    22 
    23   $ hg ci -qAm "other"
    23   $ hg ci -qAm "other"
    24 
    24 
    25   $ hg merge --debug
    25   $ hg merge --debug
    26     searching for copies back to rev 1
       
    27     unmatched files in other:
    26     unmatched files in other:
    28      b
    27      b
    29      c
    28      c
    30     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
    29     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
    31      src: 'a' -> dst: 'b' *
    30      src: 'a' -> dst: 'b' *