equal
deleted
inserted
replaced
34 resolving manifests |
34 resolving manifests |
35 branchmerge: True, force: False, partial: False |
35 branchmerge: True, force: False, partial: False |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
37 1: other deleted -> r |
37 1: other deleted -> r |
38 removing 1 |
38 removing 1 |
39 updating: 1 1/2 files (50.00%) |
|
40 1a: remote created -> g |
39 1a: remote created -> g |
41 getting 1a |
40 getting 1a |
42 updating: 1a 2/2 files (100.00%) |
|
43 2: remote unchanged -> k |
41 2: remote unchanged -> k |
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
42 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45 (branch merge, don't forget to commit) |
43 (branch merge, don't forget to commit) |
46 |
44 |
47 $ hg ci -m merge1 # 3 |
45 $ hg ci -m merge1 # 3 |
66 resolving manifests |
64 resolving manifests |
67 branchmerge: True, force: False, partial: False |
65 branchmerge: True, force: False, partial: False |
68 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
66 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
69 preserving 1a for resolve of 1a |
67 preserving 1a for resolve of 1a |
70 1a: local copied/moved from 1 -> m |
68 1a: local copied/moved from 1 -> m |
71 updating: 1a 1/1 files (100.00%) |
|
72 picked tool 'internal:merge' for 1a (binary False symlink False) |
69 picked tool 'internal:merge' for 1a (binary False symlink False) |
73 merging 1a and 1 to 1a |
70 merging 1a and 1 to 1a |
74 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
71 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
75 premerge successful |
72 premerge successful |
76 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
73 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
90 branchmerge: True, force: False, partial: False |
87 branchmerge: True, force: False, partial: False |
91 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
88 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
92 preserving 1 for resolve of 1a |
89 preserving 1 for resolve of 1a |
93 removing 1 |
90 removing 1 |
94 1a: remote moved from 1 -> m |
91 1a: remote moved from 1 -> m |
95 updating: 1a 1/1 files (100.00%) |
|
96 picked tool 'internal:merge' for 1a (binary False symlink False) |
92 picked tool 'internal:merge' for 1a (binary False symlink False) |
97 merging 1 and 1a to 1a |
93 merging 1 and 1a to 1a |
98 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
94 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
99 premerge successful |
95 premerge successful |
100 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
96 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |