equal
deleted
inserted
replaced
71 marked working directory as branch branch1 |
71 marked working directory as branch branch1 |
72 adding file1 |
72 adding file1 |
73 marked working directory as branch branch2 |
73 marked working directory as branch branch2 |
74 adding file2 |
74 adding file2 |
75 removing file1 |
75 removing file1 |
76 created new head |
|
77 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 |
76 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 |
78 the backout changeset is a new head - do not forget to merge |
77 the backout changeset is a new head - do not forget to merge |
79 (use "backout --merge" if you want to auto-merge) |
78 (use "backout --merge" if you want to auto-merge) |
80 % on branch2 with branch1 not merged, so file1 should still exist: |
79 % on branch2 with branch1 not merged, so file1 should still exist: |
81 45bbcd363bf0 (branch2) |
80 45bbcd363bf0 (branch2) |