added git config diff and merge tools