Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1246:ae96c85fb0af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el: implement hg-pull, and stub in hg-update.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 09 Sep 2005 22:07:10 -0700
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