Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | 0e2be889ccd7 |
children | 3b1b44b917f4 |
comparison
equal
deleted
inserted
replaced
1580:4737b36e324e | 1581:db10b7114de0 |
---|---|
14 remote created b | 14 remote created b |
15 getting b | 15 getting b |
16 merging a | 16 merging a |
17 resolving a | 17 resolving a |
18 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 | 18 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 |
19 abort: outstanding uncommited changes | |
20 failed | |
19 resolving manifests | 21 resolving manifests |
20 force None allow 1 moddirstate True linear True | 22 force None allow 1 moddirstate True linear True |
21 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | 23 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
22 changeset: 1:1e71731e6fbb | 24 changeset: 1:1e71731e6fbb |
23 tag: tip | 25 tag: tip |