diff doc/hgmerge.1.txt @ 1154:c3cb9f39a91f

patchbomb: fix up confusion between strings and lists of strings.
author bos@serpentine.internal.keyresearch.com
date Mon, 29 Aug 2005 12:15:37 -0700
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff