diff doc/hgmerge.1.txt @ 2000:6f6e210b38cf

add benoit's test for issue148.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 24 Mar 2006 10:31:23 -0800
parents 3ab6e55ee361
children 345bac2bc4ec
line wrap: on
line diff