Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2112:2b03c6733efa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add "archive" command, like "cvs export" only better. most code in mercurial/archival.py module, for sharing with hgweb.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 21 Apr 2006 15:27:57 -0700
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