Git: Add meld as external diff tool
Git: Use Kdiff3 as mergetool
Git: Some alias
Git: Use p4merge as mergetool
Git: New alias to diff cached files