Mercurial > hg

comparison tests/test-merge5.out @ 3592:fffc8a733bf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 31 Oct 2006 13:02:49 +0100
parents 41989e55fa37
children 4b0c9c674707
comparison
equal deleted inserted replaced
3580:41989e55fa37 3592:fffc8a733bf9
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 removing b 2 removing b
3 abort: outstanding uncommited changes, use 'hg update -C' to lose changes 3 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved