diff hgeditor @ 829:764b0350acb8

Shortened hgmerge a little bit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:16:41 +0100
parents 0902ffece4b4
children 232d0616a80a 1fe3b14c7044 9c918287d10b
line wrap: on
line diff