Mercurial > hg
view tests/test-conflict.out @ 8509:5cd232ebc317
coal/paper: minimize whitespace differences in CSS files
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 19 May 2009 00:57:36 +0200 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig