14 remote created b

    14 remote created b

    15 getting b

    15 getting b

    16 merging a

    16 merging a

    17 resolving a

    17 resolving a

    18 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

    18 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

    19 resolving manifests

    21 resolving manifests

    20  force None allow 1 moddirstate True linear True

    22  force None allow 1 moddirstate True linear True

    21  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e

    23  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e

    22 changeset:   1:1e71731e6fbb

    24 changeset:   1:1e71731e6fbb

    23 tag:         tip

    25 tag:         tip