Mercurial > hg
view tests/test-resolve.out @ 9484:c96d73dd956d
gendoc: do not wrap encoded string
- it breaks multi-byte characters
- it is not needed since Docutils will take care of wrapping the
strings as necessary
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 27 Sep 2009 10:04:51 +0200 |
parents | b2310903c462 |
children | 51021f4c80b5 |
line wrap: on
line source
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 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon % resolve -l, should be empty