comparison doc/hgmerge.1.txt @ 1310:7e8a55c9ee5c

Updated CONTRIBUTORS.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 21 Sep 2005 08:25:46 +0200
parents c084cfbb2389
children 3ab6e55ee361
comparison
equal deleted inserted replaced
1309:332f225b835c 1310:7e8a55c9ee5c