test-merge-force.out
10 lines
| 281 B
| text/plain
|
TextLexer
/ tests / test-merge-force.out
Alexis S. L. Carvalho
|
r6255 | % local deleted a file, remote removed | ||
|
Alexis S. L. Carvalho
|
r6256 | abort: outstanding uncommitted changes | ||
|
Alexis S. L. Carvalho
|
r6255 | resolving manifests | ||
| removing a | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| % should show a as removed | ||||
| R a | ||||
| % manifest. should not have a: | ||||
| b | ||||