tests/test-merge5.out
author Isaac Jurado <diptongo@gmail.com>
Sat, 05 Apr 2008 21:29:02 +0200
changeset 6485 938319418d8c
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
highlight: Generate pygments style sheet dynamically This patch allows a per-repository (for example, within a hgwebdir) selection of pygments_style web option. No static .css files required. Test edited by pmezard (compatibility fixes)

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')