diff hgmerge @ 1396:8c3e2a254257

check if a file is ignored before complaining if it is an unsupported type
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 18 Oct 2005 00:45:27 -0700
parents 9c918287d10b
children 696851b1bba9
line wrap: on
line diff