equal
deleted
inserted
replaced
1 % init foo-base |
|
2 % create alpha in first repo |
|
3 adding alpha |
|
4 % clone foo-base to foo-work |
|
5 updating to branch default |
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 % create beta in second repo |
|
8 adding beta |
|
9 % create gamma in first repo |
|
10 adding gamma |
|
11 % pull into work and merge |
|
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 (branch merge, don't forget to commit) |
|
14 % revert to changeset 1 to simulate a failed merge |
|
15 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|