view tests/test-conflict.out @ 1928:50e1c90b0fcf

clarify license on md5sum.py
author Peter van Dijk <peter@dataloss.nl>
date Mon, 06 Mar 2006 17:58:53 +0100
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