Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 2629:a49534aac47d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context.py: various fixes - use a normal changeset instead of a context - define _filenode instead of _node to match the else clause
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 16 Jul 2006 16:40:24 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
2628:9999a796d389 2629:a49534aac47d