Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 5212:b772c0b9f0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 12:24:54 -0700
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