Mercurial > hg
annotate tests/test-merge5.out @ 3580:41989e55fa37
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 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2038
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
2 removing b |
3580
41989e55fa37
allow update to switch to a different branch if the repo is clean
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2830
diff
changeset
|
3 abort: outstanding uncommited changes, use 'hg update -C' to lose changes |
41989e55fa37
allow update to switch to a different branch if the repo is clean
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2830
diff
changeset
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |