Mercurial > hg
diff tests/test-status-color.out @ 10223:51421ab573de
color: colorize output of hg resolve -l
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Sat, 09 Jan 2010 10:47:47 +0100 |
| parents | 7b3d837ca60e |
| children |
line wrap: on
line diff
--- a/tests/test-status-color.out Fri Jan 08 20:56:28 2010 +0100 +++ b/tests/test-status-color.out Sat Jan 09 10:47:47 2010 +0100 @@ -132,3 +132,16 @@ [0;31;1mR removed[0m [0;36;1;4m! deleted[0m [0;35;1;4m? unknown[0m +2 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +merging a +warning: conflicts during merge. +merging a failed! +merging b +warning: conflicts during merge. +merging b failed! +0 files updated, 0 files merged, 0 files removed, 2 files unresolved +use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +hg resolve with one unresolved, one resolved: +[0;31;1mU a[0m +[0;32;1mR b[0m