updated gitconfig to use p4merge