diff doc/hgmerge.1.txt @ 1734:9488d53233b5

tests for new hooks. fix things i found when writing tests.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 16 Feb 2006 09:56:31 -0800
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff