Mercurial > hg
view tests/test-resolve.out @ 11512:488a80c840ac stable
mercurial.spec: rename docutils to python-docutils in BuildRequires
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python. The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
author | Julian Cowley <julian@lava.net> |
---|---|
date | Fri, 02 Jul 2010 14:14:30 -1000 |
parents | 51021f4c80b5 |
children |
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 % resolve -l, should be empty