JuxtaCode - Compare code, resolve conflicts

Hi all, I've added a search feature to JuxtaCode and would like to get as much feedback as possible before releasing it.

JuxtaCode is a Git diff and merge tool that lets you:

  • Browse commits
  • Compare code changes
  • See file history
  • Resolve merge conflicts

You can also compare and merge any plain text.

Thanks for taking a look! :)