Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge5.out @ 3580:41989e55fa37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow update to switch to a different branch if the repo is clean
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 29 Oct 2006 13:08:10 +0100
parents 49988d9f0758
children fffc8a733bf9
comparison
equal deleted inserted replaced
3579:0ed2732aa393 3580:41989e55fa37
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: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 3 abort: outstanding uncommited changes, use 'hg update -C' to lose changes
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved