tests/test-update-renames.out
author Mads Kiilerich <mads@kiilerich.com>
Wed, 21 Jul 2010 17:51:37 +0200
branchstable
changeset 11639 a0c5f531daab
parent 10874 4f11978ae45d
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.

merging a and b to b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges