Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4593:2937d0dbfab0
Make --import-branch option actually work (- is translated to _)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 17 Jun 2007 14:11:30 +0200 |
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