Add extdiff extenstion to mercurial config
Merge branch 'master' of github.com:alapshin/dotfiles