.hgrc

Thu, 16 Oct 2014 16:01:09 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Thu, 16 Oct 2014 16:01:09 -0400
branch
mhoward-lt
changeset 153
a006fee06b80
parent 84
04dfcc1f5eb6
permissions
-rw-r--r--

Merge from default

[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