| changeset 2175 | b2ae81a7df29 |
| parent 2158 | ec96c4518236 |
| child 2268 | 6c9305fbebaf |
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
14 # backout with merge |
14 # backout with merge |
15 adding a |
15 adding a |
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 |
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 |
17 merging with changeset 2:b66ea5b77abb |
17 merging with changeset 2:b66ea5b77abb |
18 merging a |
18 merging a |
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
20 (branch merge, don't forget to commit) |
|
19 line 1 |
21 line 1 |