Sat, 28 Jun 2014 03:25:18 -0400
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