equal
deleted
inserted
replaced
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 |
23 resolving a |
24 my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b |
24 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
25 getting b |
25 getting b |
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
27 changeset: 1:802f095af299 |
27 changeset: 1:802f095af299 |
28 tag: tip |
28 tag: tip |
29 user: test |
29 user: test |
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b |
54 a: versions differ -> m |
54 a: versions differ -> m |
55 b: remote created -> g |
55 b: remote created -> g |
56 merging a |
56 merging a |
57 resolving a |
57 resolving a |
58 my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b |
58 my a@. other a@802f095af299 ancestor a@33aaa84a386b |
59 getting b |
59 getting b |
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
61 changeset: 1:802f095af299 |
61 changeset: 1:802f095af299 |
62 tag: tip |
62 tag: tip |
63 user: test |
63 user: test |
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b |
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b |
105 a: versions differ -> m |
105 a: versions differ -> m |
106 b: versions differ -> m |
106 b: versions differ -> m |
107 merging a |
107 merging a |
108 resolving a |
108 resolving a |
109 my a@802f095af299 other a@030602aee63d ancestor a@33aaa84a386b |
109 my a@. other a@030602aee63d ancestor a@33aaa84a386b |
110 merging b |
110 merging b |
111 resolving b |
111 resolving b |
112 my b@802f095af299 other b@030602aee63d ancestor b@000000000000 |
112 my b@. other b@030602aee63d ancestor b@000000000000 |
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) |
114 (branch merge, don't forget to commit) |
115 changeset: 1:802f095af299 |
115 changeset: 1:802f095af299 |
116 user: test |
116 user: test |
117 date: Mon Jan 12 13:46:40 1970 +0000 |
117 date: Mon Jan 12 13:46:40 1970 +0000 |