tests/test-merge8.out
author Mads Kiilerich <mads@kiilerich.com>
Wed, 21 Jul 2010 17:51:37 +0200
branchstable
changeset 11639 a0c5f531daab
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

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