Dont use diffmerge by default in gitconfig

[#82458492] Ensure fig_platform config and docs are up to date and accurate