Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2988:65efeb7b2c56
mercurial.el: speed up mode line updates.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 22 Aug 2006 14:02:43 -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