test-resolve.out
9 lines
| 344 B
| text/plain
|
TextLexer
/ tests / test-resolve.out
Martin Geisler
|
r7734 | adding file | ||
| % create a second head | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| created new head | ||||
| % failing merge | ||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
Stuart W Marks
|
r9468 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||
|
Martin Geisler
|
r7734 | % resolve -l, should be empty | ||
Martin Geisler
|
r11451 | % resolve -l, should be empty | ||