Mercurial > hg
view tests/test-merge5.out @ 4166:c0271aba6abe
small fixes for the parent patch
- format.usestore is a boolean option
- python wart: ("revlogv1") is a string, not a tuple
- only create a dummy changelog if we're using a store
- add a test
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 08 Mar 2007 20:08:24 -0300 |
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