conflicts

• Sublimerge 3

  by Borys Forytarz ST3 Missing 138K Installs
  Amazing side-by-side diff & merge tool to compare files and directories. Work with differences between text and revisions. Resolve merge conflicts. Supports Git, SVN, Mercurial and command line.

• Sublimerge Pro

  by Borys Forytarz Missing 171K Installs
  Side-by-side diff & merge tool to compare files and directories. Work with differences between text and revisions. Supports Git, SVN, Mercurial and command line. Primarily for ST2. ST3 users should install even more feature-rich Sublimerge 3.