diff doc/hgmerge.1.txt @ 4065:8ee983e3d461

fix strip'ping the second parent of a merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 06 Feb 2007 15:54:58 -0200
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff