diff -r d95d6ab31a4a -r 95b15ebd8e1e .hgrc --- a/.hgrc Thu Jan 09 19:05:36 2014 +0200 +++ b/.hgrc Tue Jan 14 11:24:18 2014 +0200 @@ -20,6 +20,11 @@ unified = 5 showfunc = 1 +[annotate] +ignorews = True +ignorewsamount = True +ignoreblanklines = True + [merge-tools] emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"