Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3650:6f6696962986

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use readline() to read branches.cache The posixfile_nt class used on windows doesn't have that method.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 15 Nov 2006 17:56:57 -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