view tests/test-merge4.out @ 3908:8020c35b6455

Include hg.1.gendoc.txt in doc/MANIFEST to prevent unnecessary rebuild.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 16 Dec 2006 13:57:37 +0100
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)