diff doc/hgmerge.1.txt @ 1614:0952d164030e

hgk.py is not a script (no '#!' line needed)
author Vincent Danjean <Vincent.Danjean@ens-lyon.org>
date Thu, 12 Jan 2006 06:29:06 +0100
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff