Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 3211:9a478efc16cc
filelog.annotate is now obsolete
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 30 Sep 2006 20:56:26 -0700 |
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