Adding splice as merge tool in hg
Merge branch 'master' of https://github.com/df3n5/dotfiles