Mercurial > hg
annotate tests/test-resolve.out @ 11649:48163c39e1f1 stable
hgwebdir: use template paths configured in the hgrc (issue2281)
author | Christian Fischer <christian@fi12.de> |
---|---|
date | Mon, 12 Jul 2010 16:07:58 +0200 |
parents | 51021f4c80b5 |
children |
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 | |
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 |