Mercurial > hg
view tests/test-conflict.out @ 2058:7e0dd64b0718
Use the new format of setting tags in view extension (Debian bug #361897)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 11 Apr 2006 12:44:13 +0200 |
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