Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3073:1a792e4a1f3a
merge with brendan
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 09 Sep 2006 12:51:05 +0200 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
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