Mercurial > hg

view tests/test-merge5.out @ 3331:f472cf9a71af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:41:52 +0200
parents 49988d9f0758
children 41989e55fa37
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