Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 3921:6d0d025e125a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: fix import x.y.z as a when x.y is already imported.
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 14:56:12 -0600
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