to set some configurations to use VS Code as a merge tool for Git. [Click on image for larger, animated GIF view.] Restoring Old Conflict Decorators in Animated Action (source: Microsoft). Checkbox ...