Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1008:85272e96b96a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Makefile for generating release tarballs. - test suite is run - documentation is generated and included
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 22 Aug 2005 08:46:43 +0200
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