view tests/test-merge-force.out @ 6987:d09e813b21e3

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).
author Rocco Rutte <pdmef@gmx.net>
date Fri, 05 Sep 2008 10:39:57 +0200
parents 4b0c9c674707
children 3682a19bb637
line wrap: on
line source

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b