Sun, 15 Jun 2014 13:08:14 -0400
Use a more manageable vimdiff
[ui] username = Meredith Howard <mhoward@roomag.org> merge = vimdiff [extensions] hgext.graphlog = 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 %include ~/.hgrc.local