equal
deleted
inserted
replaced
40 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
40 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
41 (branch merge, don't forget to commit) |
41 (branch merge, don't forget to commit) |
42 -------------- |
42 -------------- |
43 M a |
43 M a |
44 M b |
44 M b |
|
45 a |
45 -------------- |
46 -------------- |
46 |
47 |
47 -------------- |
48 -------------- |
48 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
49 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
49 -------------- |
50 -------------- |
83 my rev@ecf3cb2a4219 other rev@f4db7e329e71 ancestor rev@924404dff337 |
84 my rev@ecf3cb2a4219 other rev@f4db7e329e71 ancestor rev@924404dff337 |
84 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
85 (branch merge, don't forget to commit) |
86 (branch merge, don't forget to commit) |
86 -------------- |
87 -------------- |
87 M b |
88 M b |
|
89 a |
88 -------------- |
90 -------------- |
89 |
91 |
90 -------------- |
92 -------------- |
91 test L: R:nc a b W: - 5 get b |
93 test L: R:nc a b W: - 5 get b |
92 -------------- |
94 -------------- |
126 my rev@ac809aeed39a other rev@97c705ade336 ancestor rev@924404dff337 |
128 my rev@ac809aeed39a other rev@97c705ade336 ancestor rev@924404dff337 |
127 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
129 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
128 (branch merge, don't forget to commit) |
130 (branch merge, don't forget to commit) |
129 -------------- |
131 -------------- |
130 M b |
132 M b |
|
133 a |
131 C a |
134 C a |
132 -------------- |
135 -------------- |
133 |
136 |
134 -------------- |
137 -------------- |
135 test L: R:nm a b W: - 7 get b |
138 test L: R:nm a b W: - 7 get b |
170 my rev@ecf3cb2a4219 other rev@97c705ade336 ancestor rev@924404dff337 |
173 my rev@ecf3cb2a4219 other rev@97c705ade336 ancestor rev@924404dff337 |
171 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
174 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
172 (branch merge, don't forget to commit) |
175 (branch merge, don't forget to commit) |
173 -------------- |
176 -------------- |
174 M b |
177 M b |
|
178 a |
175 -------------- |
179 -------------- |
176 |
180 |
177 -------------- |
181 -------------- |
178 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
182 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
179 -------------- |
183 -------------- |
428 my rev@ec03c2ca8642 other rev@f4db7e329e71 ancestor rev@924404dff337 |
432 my rev@ec03c2ca8642 other rev@f4db7e329e71 ancestor rev@924404dff337 |
429 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
433 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
430 (branch merge, don't forget to commit) |
434 (branch merge, don't forget to commit) |
431 -------------- |
435 -------------- |
432 M b |
436 M b |
|
437 a |
433 -------------- |
438 -------------- |
434 |
439 |
435 -------------- |
440 -------------- |
436 test L:nm a b R:up a c W: - 23 get c, keep b |
441 test L:nm a b R:up a c W: - 23 get c, keep b |
437 -------------- |
442 -------------- |
450 my rev@ecf3cb2a4219 other rev@2b958612230f ancestor rev@924404dff337 |
455 my rev@ecf3cb2a4219 other rev@2b958612230f ancestor rev@924404dff337 |
451 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
456 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
452 (branch merge, don't forget to commit) |
457 (branch merge, don't forget to commit) |
453 -------------- |
458 -------------- |
454 M b |
459 M b |
|
460 a |
455 M c |
461 M c |
456 -------------- |
462 -------------- |
457 |
463 |