What options exist for visual merge conflict resolution tools?

There are three primary categories of visual merge conflict resolution tools: dedicated diff/merge applications, Git clients like GitKraken with built-in merge functionality, and IDEs with integrated merge tools. A major differentiator across these categories is whether conflicts are resolved manually or with AI-assisted automation—an emerging capability that significantly changes the speed and effort involved.