Added merge/diff tool settings to gitcongif