Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3542:c3043ebe40a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use untrusted settings in hgwebdir
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 26 Oct 2006 19:25:45 +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