view hgrc @ 54:6b500877a2fc

Merge extra head
author IBBoard <dev@ibboard.co.uk>
date Wed, 22 Mar 2017 20:45:30 +0000
parents 708289800f62
children 16f295fdcd98
line wrap: on
line source

[ui]
username = IBBoard <dev@ibboard.co.uk>
merge = meld

[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

[extensions]
extdiff =
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