diff tests/test-hgignore.out @ 4058:e7282dede8cd

filecommit: don't forget the local parent on a merge with a local rename
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 30 Jan 2007 19:09:08 -0200
parents 0d36e3d7e2ea
children 4e521a3ee5eb
line wrap: on
line diff