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

External diff tool doesn't launch

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Needs Triage (View Workflow)
    • Priority: Medium
    • Resolution: Unresolved
    • Affects Version/s: 3.0.15
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Environment:

      SourceTree 3.0.15 on Windows 10 64-bit

      Embedded GIT: 2.18.0, git-lfs v2.2.4

      System GIT: 2.19.0.windows.1

    • Symptom Severity:
      Severity 3 - Minor

      Description

      Since I updated my SourceTree a while ago the "External Diff" is not working anymore. I do not remember the exact version it started to fail.

      The internal diff shows the differences but I would like to use my installed WinMerge for diffs.

      I checked the <HOME_DIR>\.gitconfig and it contains the following:

      [difftool "sourcetree"]
       cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' $LOCAL $REMOTE
      [mergetool "sourcetree"]
       cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' $LOCAL $REMOTE $MERGED
       trustExitCode = true
      [merge]
       tool = sourcetree
      [diff]
       guitool = sourcetree 

      I opened the "Process Viewer" and executed the "External Diff" command. It reports

      Unknown merge tool sourcetree
      fatal: external diff died, stopping at <relative_path_to_my_file> 

      I stored the "Process Viewer" log to XML, copied out the GIT command line and executed in CMD.exe: it worked as expected and opened WinMerge.

      I tried configuring the "External Diff/Merge" section in Tools -> Options using "WinMerge", "Custom" or any other tool: no change

      I switched "GIT Version" to "System": no change

      I updated the embedded GIT: no change

      I switched off using "LibGit2 integration": no change

        Attachments

        1. 1D0-571.pdf
          1 kB
        2. 1D0-61B.pdf
          1 kB
        3. 1D0-621.pdf
          1 kB
        4. 1K0-001.pdf
          1 kB
        5. 1V0-603.pdf
          1 kB
        6. 1V0-701.pdf
          1 kB
        7. 1Y0-203.pdf
          1 kB
        8. 1Y0-230.pdf
          1 kB
        9. 1Y0-240.pdf
          1 kB
        10. 1Y0-311.pdf
          1 kB
        11. 1Y0-340.pdf
          1 kB
        12. 1Y0-371.pdf
          1 kB
        13. 1Y0-402.pdf
          1 kB
        14. 1Y0-A22.pdf
          1 kB
        15. 1Z0-028.pdf
          1 kB
        16. 1Z0-047.pdf
          1 kB
        17. 1Z0-051.pdf
          1 kB
        18. 1Z0-052.pdf
          1 kB
        19. 1Z0-053.pdf
          1 kB
        20. 1Z0-060.pdf
          1 kB
        21. 1Z0-061.pdf
          1 kB
        22. 1Z0-062.pdf
          1 kB
        23. 1Z0-063.pdf
          1 kB
        24. 1Z0-066.pdf
          1 kB
        25. 1Z0-067.pdf
          1 kB
        26. 1Z0-068.pdf
          1 kB
        27. 1Z0-070.pdf
          1 kB
        28. 1Z0-071.pdf
          1 kB
        29. 1Z0-100.pdf
          1 kB
        30. 1Z0-133.pdf
          1 kB
        31. 1Z0-144.pdf
          1 kB
        32. 1Z0-146.pdf
          1 kB
        33. 1Z0-148.pdf
          1 kB
        34. 1Z0-161.pdf
          1 kB
        35. 1Z0-218.pdf
          1 kB
        36. 1Z0-228.pdf
          1 kB
        37. 1Z0-320.pdf
          1 kB
        38. 1Z0-321.pdf
          1 kB
        39. 1Z0-322.pdf
          1 kB
        40. 1Z0-324.pdf
          1 kB
        41. 1Z0-325.pdf
          1 kB
        42. 1Z0-330.pdf
          1 kB
        43. 1Z0-338.pdf
          1 kB
        44. 1Z0-339.pdf
          1 kB
        45. 1Z0-342.pdf
          1 kB
        46. 1Z0-346.pdf
          1 kB
        47. 1Z0-347.pdf
          1 kB
        48. 1Z0-348.pdf
          1 kB
        49. 1Z0-349.pdf
          1 kB
        50. 1Z0-404.pdf
          1 kB

          Activity

            People

            Assignee:
            Unassigned
            Reporter:
            tschleu tschleu
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Dates

              Created:
              Updated: