Mercurial > hg
view tests/test-conflict.out @ 7746:59815cef38f0
hgk: added colour settings for different colours in diff view
author | Robert Bauck Hamar <r.b.hamar@usit.uio.no> |
---|---|
date | Mon, 09 Feb 2009 19:00:52 +0100 |
parents | 92ccccb55ba3 |
children | 9fe7e6acf525 |
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 e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig