Mercurial Mercurial > hg-stable / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-copy-move-merge.t
changeset 18541 5ed6a375e9ca
parent 18362 5a4f220fbfca
child 18605 bcf29565d89f
equal deleted inserted replaced
18540:139529b0a191 18541:5ed6a375e9ca 
    30     checking for directory renames
 
    30     checking for directory renames
 
    31   resolving manifests
 
    31   resolving manifests
 
    32    overwrite: False, partial: False
 
    32    overwrite: False, partial: False
 
    33    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
 
    33    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
 
    34    a: remote moved to b -> m
 
    34    a: remote moved to b -> m
 
       
    35     preserving a for resolve of b
 
    35    a: remote moved to c -> m
 
    36    a: remote moved to c -> m
 
    36   preserving a for resolve of b
 
    37     preserving a for resolve of c
 
    37   preserving a for resolve of c
 
       
    38   removing a
 
    38   removing a
 
    39   updating: a 1/2 files (50.00%)
 
    39   updating: a 1/2 files (50.00%)
 
    40   picked tool 'internal:merge' for b (binary False symlink False)
 
    40   picked tool 'internal:merge' for b (binary False symlink False)
 
    41   merging a and b to b
 
    41   merging a and b to b
 
    42   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
 
    42   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
hg-stable