Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4037:bbdba01cce28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enforce unixish style for all generated patch names. User supplied names are left unchanged (including those loaded from series).
author Patrick Mezard <pmezard@gmail.com>
date Wed, 17 Jan 2007 22:19:36 +0100
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