diff doc/hgmerge.1.txt @ 746:9095e3456ea7

Change C to M in status
author mpm@selenic.com
date Thu, 21 Jul 2005 12:24:42 -0500
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff