tests/test-double-merge.t
changeset 26517 d8463a743d7d
parent 25125 bd625cd4e5e7
child 26618 8e6d5b7317e6
equal deleted inserted replaced
26516:eb9876aa8770 26517:d8463a743d7d
    36    branchmerge: True, force: False, partial: False
    36    branchmerge: True, force: False, partial: False
    37    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    37    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    38    preserving foo for resolve of bar
    38    preserving foo for resolve of bar
    39    preserving foo for resolve of foo
    39    preserving foo for resolve of foo
    40    bar: remote copied from foo -> m
    40    bar: remote copied from foo -> m
    41   picked tool 'internal:merge' for bar (binary False symlink False)
    41   picked tool ':merge' for bar (binary False symlink False)
    42   merging foo and bar to bar
    42   merging foo and bar to bar
    43   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    43   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    44    premerge successful
    44    premerge successful
    45    foo: versions differ -> m
    45    foo: versions differ -> m
    46   picked tool 'internal:merge' for foo (binary False symlink False)
    46   picked tool ':merge' for foo (binary False symlink False)
    47   merging foo
    47   merging foo
    48   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
    48   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
    49    premerge successful
    49    premerge successful
    50   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
    50   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
    51   (branch merge, don't forget to commit)
    51   (branch merge, don't forget to commit)