Mercurial > hg

view tests/test-merge5.out @ 3897:7034020aeaf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Dec 2006 05:38:54 +0100
parents fffc8a733bf9
children 4b0c9c674707
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