diff doc/hgmerge.1.txt @ 643:c9e159bb9a3d

typo in help message. From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:27:53 -0800
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff