Mercurial > hg
view tests/test-merge5.out @ 5478:5223c360503e
patchbomb: fix traceback when diffstat isn't available
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 26 Oct 2007 12:01:14 +0200 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
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