Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1791:1ed9e97d9d6d
Merge with jeffpc's hg-static
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 22 Feb 2006 08:11:52 +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