equal
deleted
inserted
replaced
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
2 %% no merges expected |
2 %% no merges expected |
3 merging for b |
|
4 merging b |
|
5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6 (branch merge, don't forget to commit) |
4 (branch merge, don't forget to commit) |
7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
8 %% merge should fail |
6 %% merge should fail |
9 abort: 'b' already exists in the working dir and differs from remote |
7 abort: 'b' already exists in the working dir and differs from remote |
17 Contents of b should be "this is file b1" |
15 Contents of b should be "this is file b1" |
18 This is file b1 |
16 This is file b1 |
19 %% merge fails |
17 %% merge fails |
20 abort: outstanding uncommitted changes |
18 abort: outstanding uncommitted changes |
21 %% merge expected! |
19 %% merge expected! |
22 merging for b |
|
23 merging b |
|
24 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
20 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
25 (branch merge, don't forget to commit) |
21 (branch merge, don't forget to commit) |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 %% merge of b should fail |
23 %% merge of b should fail |
28 abort: outstanding uncommitted changes |
24 abort: outstanding uncommitted changes |