Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1528:c9f33196805b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add an atomic argument to util.opener when atomic is used, the file while be renamed on close
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 11 Nov 2005 15:33:59 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a