# HG changeset patch # User Meredith Howard # Date 1446180783 14400 # Node ID 1dc0597fe712db6198d479dab0b63610fce9aad1 # Parent 607a4c596cdbefc61ce27c26d544ee83f3b89136 Nicer diffs diff --git a/.hgrc b/.hgrc --- a/.hgrc +++ b/.hgrc @@ -27,6 +27,10 @@ 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}