.hgrc

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

[extensions]
color =
graphlog =
pager =
progress =
churn =
rebase =
record =
shelve =
histedit =
schemes =

[pager]
pager = LESS='FSRXi' less

[alias]
fetch = pull --rebase
ctags = !~/bin/git-ctags

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

[diff]
git = true
showfunc = true

[committemplate]
changeset = {desc}\n\n
    HG: {extramsg}
    HG: user: {author}\n{ifeq(p2rev, "-1", "",
   "HG: branch merge\n")
   }HG: branch '{branch}'\n{if(currentbookmark,
   "HG: bookmark '{currentbookmark}'\n")  }{subrepos %
   "HG: subrepo {subrepo}\n"              }
   {splitlines(diff()) % 'HG: {line}\n'}

%include ~/.hgrc.local