Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4058:e7282dede8cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filecommit: don't forget the local parent on a merge with a local rename
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 30 Jan 2007 19:09:08 -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