diff doc/hgmerge.1.txt @ 1295:abcdf14449ea

Make contract with extensions optional.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 21 Sep 2005 14:22:16 -0700
parents c084cfbb2389
children 3ab6e55ee361
line wrap: on
line diff