¹⁸Run git config merge.conflictStyle diff3. Use –global if you want it to apply globally on your user’s config, not on a per-repo basis