test-issue612.out
11 lines
| 315 B
| text/plain
|
TextLexer
/ tests / test-issue612.out
Matt Mackall
|
r4819 | adding src/a.c | ||
|
Matt Mackall
|
r5610 | moving src/a.c to source/a.c | ||
|
Matt Mackall
|
r4819 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
Dirkjan Ochtman
|
r6336 | created new head | ||
|
Matt Mackall
|
r4819 | ? src/a.o | ||
| merging src/a.c and source/a.c | ||||
| 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | ||||
| M source/a.c | ||||
| R src/a.c | ||||
| ? source/a.o | ||||