Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3249:168485fa44ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 04 Oct 2006 22:07:03 +0200
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