diff doc/hgmerge.1.txt @ 3461:8b55c0ba8048

makes username mandatory
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 18 Oct 2006 22:24:03 +0200
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff