Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4244:7663780b55a7
Add hg-relink script to contrib
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 19 Mar 2007 09:36:06 -0700 |
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