Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4904:59b8ff35c4ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: patches should be read and written in binary mode when possible.
author Patrick Mezard <pmezard@gmail.com>
date Tue, 17 Jul 2007 23:35:24 +0200
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