hgrc: Support kdiff3 for merges.
Merge branch 'master' of github.com:Smattr/mattutils

Conflicts:
	config/.hgrc