Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5471:5b81c1cc6ebe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make test-mq-guards work with ksh
author Jim Hague <jim.hague@acm.org>
date Fri, 19 Oct 2007 19:20:33 +0000
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