diff hgmerge @ 1121:14a69c4988cd

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