.hgrc

Wed, 11 Feb 2015 23:47:29 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 11 Feb 2015 23:47:29 -0500
branch
mhoward-lt
changeset 170
fb8391e37094
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