JuxtaCode

JuxtaCode is the premier tool to:

• Review code changes

• View a file's history

• Get insights into merge conflicts

• Resolve conflicts with a 3-way merge tool

• Diff and merge any text

Features include:

• Syntax highlighting

• Command line tool

• Visual Studio Code extension