Mercurial > hg

comparison tests/test-conflict @ 2065:2ff37e3bf780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix update when a locally added file match the target revision the dirstate entry for the added file wasn't updated. fix issue207
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 14 Apr 2006 00:41:50 +0200
parents 7544700fd931
children e506c14382fd
comparison
equal deleted inserted replaced
2064:547ede0123a2 2065:2ff37e3bf780