Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 3592:fffc8a733bf9
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 31 Oct 2006 13:02:49 +0100 |
parents | 41989e55fa37 |
children | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
3580:41989e55fa37 | 3592:fffc8a733bf9 |
---|---|
91 changeset: 1:802f095af299 | 91 changeset: 1:802f095af299 |
92 user: test | 92 user: test |
93 date: Mon Jan 12 13:46:40 1970 +0000 | 93 date: Mon Jan 12 13:46:40 1970 +0000 |
94 summary: 2 | 94 summary: 2 |
95 | 95 |
96 abort: outstanding uncommited changes, use 'hg update -C' to lose changes | 96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
97 failed | 97 failed |
98 abort: outstanding uncommitted changes | 98 abort: outstanding uncommitted changes |
99 failed | 99 failed |
100 resolving manifests | 100 resolving manifests |
101 overwrite False partial False | 101 overwrite False partial False |