# HG changeset patch # User Oleksandr Gavenko # Date 1387268475 -7200 # Node ID 4371bfe8ea968cc97ad4fde63038e0241645828e # Parent 649cbbab7ded1ec426680ed5b0a9dfd656a055bb Set useful "hg diff" defaults. diff -r 649cbbab7ded -r 4371bfe8ea96 .hgrc --- a/.hgrc Tue Oct 29 20:19:23 2013 +0200 +++ b/.hgrc Tue Dec 17 10:21:15 2013 +0200 @@ -14,7 +14,11 @@ log = -v incoming = -v outgoing = -v -diff = --git + +[diff] +git = 1 +unified = 5 +showfunc = 1 [merge-tools] emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"