equal
deleted
inserted
replaced
1 # basic operation |
1 # basic operation |
2 adding a |
2 adding a |
3 changeset 2:c86754337410 backs out changeset 1:a820f4f40a57 |
3 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57 |
4 a |
4 a |
5 # file that was removed is recreated |
5 # file that was removed is recreated |
6 adding a |
6 adding a |
7 adding a |
7 adding a |
8 changeset 2:d2d961bd79f2 backs out changeset 1:76862dcce372 |
8 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372 |
9 content |
9 content |
10 # backout of backout is as if nothing happened |
10 # backout of backout is as if nothing happened |
11 removing a |
11 removing a |
12 changeset 3:8a7eeb5ab5ce backs out changeset 2:d2d961bd79f2 |
12 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a |
13 cat: a: No such file or directory |
13 cat: a: No such file or directory |
14 # backout with merge |
14 # backout with merge |
15 adding a |
15 adding a |
16 changeset 3:3c9e845b409c 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 |
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
20 (branch merge, don't forget to commit) |
20 (branch merge, don't forget to commit) |
21 line 1 |
21 line 1 |