Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4483:a11e13d50645

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: Validate email config before we start prompting for info.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 27 May 2007 14:40:14 -0700
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