Mercurial > hg-stable
view tests/test-conflict.out @ 1662:2d8dc84c9323
Added missing quote in warning text to tests, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 29 Jan 2006 14:36:11 +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