equal
deleted
inserted
replaced
32 % merge heads |
32 % merge heads |
33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 (branch merge, don't forget to commit) |
34 (branch merge, don't forget to commit) |
35 % commit issue 1476 |
35 % commit issue 1476 |
36 copies: c2 (c1) |
36 copies: c2 (c1) |
37 rolling back last transaction |
37 rolling back commit to revision 3 |
38 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
38 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
39 % merge heads again |
39 % merge heads again |
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 2 files updated, 0 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 % commit issue 1476 with a rename on the other side |
42 % commit issue 1476 with a rename on the other side |