Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 1396:8c3e2a254257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1395:c2eb204917f8 1396:8c3e2a254257