diff doc/hgmerge.1.txt @ 3984:f82b3f915605

Fix a pygettext complaint
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Dec 2006 17:32:25 -0600
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff