Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4999:60c54154ec4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't forget to update the dirstate for exec bit changes
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jul 2007 11:19:53 -0500
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