Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3125:2e043c9a38a6
hgweb: fix errors spotted by pychecker
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 18 Sep 2006 17:32:28 +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