diff doc/hgmerge.1.txt @ 2139:74f70f2e08aa

Fixed test output for not using the deprecated 'hg forget'.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Apr 2006 13:05:02 +0200
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff