Mercurial > hg
view tests/test-conflict.out @ 1939:d59fc0d4558f
Use timestamps without leading 0 in test-command-template for portable tests.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 13 Mar 2006 18:33:33 +0100 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a