Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-685

SourceTree does not open KDiff3

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • 1.0.4
    • 1.0.2
    • General
    • standalone, Windows 7

      In
      Tools/Options/Diff/Merge Tool
      I selected KDiff3.
      KDiff3 is installed in
      C:\Program Files (x86)\KDiff3\kdiff3.exe

      I merged a feature branch in master and have a merge conflict.
      I rightclick on my file and select
      Resolve Conflicts / Launch external merge tool.
      It creates a number of files:
      .BACKUP.
      .BASE.
      .LOCAL.
      .REMOTE

      But it does not launch KDiff3.

              sstreeting Steve Streeting (Inactive)
              dbe6d010917c Oliver Kötter
              Votes:
              0 Vote for this issue
              Watchers:
              10 Start watching this issue

                Created:
                Updated:
                Resolved: