diff doc/hgrc.5.txt @ 2552:bb403d427974

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:28:31 +0200
parents e10665147d26
children 6e5427447f4c
line wrap: on
line diff