Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 2981:0171a5432621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support the demandload syntax "@" in packagescan
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Thu, 10 Aug 2006 16:59:58 +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