tests/test-merge5.out
author Rocco Rutte <pdmef@gmx.net>
Fri, 05 Sep 2008 10:39:57 +0200
changeset 6987 d09e813b21e3
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
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
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')