annotate tests/test-resolve.out @ 7757:af6a63438a8a
identify: have consistent output for local repositories
Also, add some extensive testing for it (hardly any in the suite so far).
author |
Dirkjan Ochtman <dirkjan@ochtman.nl> |
date |
Fri, 13 Feb 2009 11:32:33 +0100 |
parents |
9f73bddb9d0b |
children |
9fe7e6acf525 |
rev |
line source |
7734
|
1 adding file
|
|
2 % create a second head
|
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
4 created new head
|
|
5 % failing merge
|
|
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
7 use 'hg resolve' to retry unresolved file merges
|
|
8 % resolve -l, should be empty
|