.hgrc

Mon, 01 Jun 2015 17:13:18 -0700

author
Meredith Howard <mhoward@roomag.org>
date
Mon, 01 Jun 2015 17:13:18 -0700
changeset 186
4d168818b573
parent 80
e2d834280dae
child 84
04dfcc1f5eb6
child 198
a4b45bcb4ba9
permissions
-rw-r--r--

verbose git-up

[ui]
username = Meredith Howard <mhoward@roomag.org>
merge = vimdiff

[extensions]
hgext.graphlog = 
mq = 
rebase = 
color = 
record = 
pager =
progress = 
fetch = 
flow = $HOME/.hgext/hgflow.py

[pager]
pager = LESS='FSRX' less

[alias]
fetch = pull --rebase

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close
vimdiff.check = changed, conflicts


%include ~/.hgrc.local

mercurial