[ui]
username = IBBoard <dev@ibboard.co.uk>
merge = meld
logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n   Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n   {tabindent(desc)}\n\n'

[trusted]
#Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) 
#If we don't trust root then we're screwed anyway!
users = root

[alias]
copush = !$HG commit $@ && $HG push
view = hgview

[extensions]
extdiff =
hgext.hgview = ~/.hgview.py
bookmarks =
hgext.convert=
color =
pager =
progress =
mercurial_keyring = 

[extdiff]
cmd.meld = meld
# Image diffing
cmd.imdiff = sh  
opts.imdiff = -c 'compare $0 $1 compared.png; display compared.png'

%include ~/.hgrc-certs

%include ~/.hgrc-auth