view tests/test-merge8.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 a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved