Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2993:425413d9ef59
Emacs: add mq.el, early support for Mercurial Queues.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 22 Aug 2006 16:04:58 -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