view hgrc @ 118:1c0461e8da55

Merge multiple heads
author IBBoard <dev@ibboard.co.uk>
date Sat, 18 Aug 2018 11:01:41 +0100
parents c9adf6fc4b61
children ac6c055e7441
line wrap: on
line source

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

%include ~/.hgrc-username-override

[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 = 
prompt = ~/.hg-prompt.py

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

[pager]
pager = LESS='FSRX' less
ignore = version, help, update, serve, record

%include ~/.hgrc-certs

%include ~/.hgrc-auth