add git diff/merge tool aliases