Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 1969:6d17d420c46c
write_bundle: close the file before removing it in case of failure
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 17 Mar 2006 18:53:04 +0100 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
rev | line source |
---|---|
346 | 1 merge: warning: conflicts during merge |
2 merging a | |
3 merging a failed! | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
4 e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 5 something else |
6 ======= | |
7 something | |
748 | 8 M a |