Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3061:fe5c92529d1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 06 Sep 2006 02:15:33 +0200
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes