test-merge1.out
31 lines
| 1.1 KiB
| text/plain
|
TextLexer
/ tests / test-merge1.out
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1236 | %% no merges expected | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
|
r1581 | %% merge should fail | ||
abort: 'b' already exists in the working dir and differs from remote | ||||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r1236 | %% | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1236 | Contents of b should be "this is file b1" | ||
|
r430 | This is file b1 | ||
|
r1581 | %% merge fails | ||
|
r1995 | abort: outstanding uncommitted changes | ||
|
r1236 | %% merge expected! | ||
|
r430 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r1581 | %% merge of b should fail | ||
|
r1995 | abort: outstanding uncommitted changes | ||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||