author | Martin Geisler <mg@lazybytes.net> |
Sun, 29 Aug 2010 23:56:19 +0200 | |
changeset 12077 | ff6f5310ad92 |
parent 11451 | 51021f4c80b5 |
permissions | -rw-r--r-- |
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 |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
7821
diff
changeset
|
7 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
7734 | 8 |
% resolve -l, should be empty |
11451
51021f4c80b5
resolve: do not crash on empty mergestate
Martin Geisler <mg@lazybytes.net>
parents:
9468
diff
changeset
|
9 |
% resolve -l, should be empty |