Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3485:23cffef5d424

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Split branchtags into two additional functions. This makes it easier to override only parts of the cache saving process.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 23 Oct 2006 23:32:56 -0300
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