Using kdiff3 as a merge tool
Removed exclusions in git-decorate