equal
deleted
inserted
replaced
18 overwrite False branchmerge False partial False |
18 overwrite False branchmerge False partial False |
19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
20 a: versions differ -> m |
20 a: versions differ -> m |
21 b: remote created -> g |
21 b: remote created -> g |
22 merging a |
22 merging a |
23 resolving a |
|
24 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
23 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
25 getting b |
24 getting b |
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
25 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
27 changeset: 1:802f095af299 |
26 changeset: 1:802f095af299 |
28 tag: tip |
27 tag: tip |
52 overwrite False branchmerge False partial False |
51 overwrite False branchmerge False partial False |
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
52 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
54 a: versions differ -> m |
53 a: versions differ -> m |
55 b: remote created -> g |
54 b: remote created -> g |
56 merging a |
55 merging a |
57 resolving a |
|
58 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
56 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
59 getting b |
57 getting b |
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61 changeset: 1:802f095af299 |
59 changeset: 1:802f095af299 |
62 tag: tip |
60 tag: tip |
103 overwrite False branchmerge True partial False |
101 overwrite False branchmerge True partial False |
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b |
102 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b |
105 a: versions differ -> m |
103 a: versions differ -> m |
106 b: versions differ -> m |
104 b: versions differ -> m |
107 merging a |
105 merging a |
108 resolving a |
|
109 my a@. other a@030602aee63d ancestor a@33aaa84a386b |
106 my a@. other a@030602aee63d ancestor a@33aaa84a386b |
110 merging b |
107 merging b |
111 resolving b |
|
112 my b@. other b@030602aee63d ancestor b@000000000000 |
108 my b@. other b@030602aee63d ancestor b@000000000000 |
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
109 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) |
110 (branch merge, don't forget to commit) |
115 changeset: 1:802f095af299 |
111 changeset: 1:802f095af299 |
116 user: test |
112 user: test |
135 requesting all changes |
131 requesting all changes |
136 adding changesets |
132 adding changesets |
137 adding manifests |
133 adding manifests |
138 adding file changes |
134 adding file changes |
139 added 1 changesets with 1 changes to 1 files |
135 added 1 changesets with 1 changes to 1 files |
140 merging a |
|
141 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
136 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |