Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1728:9b92b71d5dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add -w and -p options to diff. this is for issue 126.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 15 Feb 2006 10:39:47 -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