Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1969:6d17d420c46c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a