Mercurial > hg > gitweb
view tests/test-merge5.out @ 3706:0d810798acb1
Use 'bundletype' instead of 'type' to not shadow built-in function.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 22 Nov 2006 22:33:57 +0100 |
parents | fffc8a733bf9 |
children |
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