tests/test-conflict.out
author Rocco Rutte <pdmef@gmx.net>
Fri, 05 Sep 2008 10:39:57 +0200
changeset 6987 d09e813b21e3
parent 6518 92ccccb55ba3
child 7821 9fe7e6acf525
permissions -rw-r--r--
highlight: only pygmentize for HTML mimetypes For non-html mimetypes it doesn't make much sense. This also fixes the issue that highlight unconditionally adds a <link/> tag for its CSS to the template's header (which is pointless in text/plain output).

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