test-issue619.out
10 lines
| 344 B
| text/plain
|
TextLexer
/ tests / test-issue619.out
Matt Mackall
|
r4748 | adding a | ||
| marked working directory as branch b | ||||
| adding b | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| fast-forward | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| bogus fast-forward should fail | ||||
|
Matt Mackall
|
r11417 | abort: merging with a working directory ancestor has no effect | ||
|
Matt Mackall
|
r4748 | done | ||