comparison doc/hgignore.5.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 956e329f9e13
children 63b9d2deed48
comparison
equal deleted inserted replaced
4064:5d9ede002453 4065:8ee983e3d461