tests/test-merge8
author Isaac Jurado <diptongo@gmail.com>
Sat, 05 Apr 2008 21:29:02 +0200
changeset 6485 938319418d8c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
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)

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update