diff doc/hgmerge.1.txt @ 802:69db1e34378b

Allow tests for not yet fixed bugs to fail without generating error diff.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:59:10 +0100
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff