diff doc/hgmerge.1.txt @ 1485:625f3f13d7be

mention running multiple hooks in the doc
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 31 Oct 2005 10:47:27 -0800
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff