Added merge tool config in .gitconfig