diff doc/hgmerge.1.txt @ 1121:14a69c4988cd

NoOptionError is unknown there.
author Ollivier Robert <roberto@keltia.freenix.fr>
date Sat, 27 Aug 2005 23:43:13 -0700
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff