Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1440:bf109779f48b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix relative pull in a subdir
author tonfa@arakou.lan
date Mon, 24 Oct 2005 17:41:45 -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