SourceTree does not open any MergeTool

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Medium
    • None
    • Affects Version/s: 1.7, 1.6.18
    • Component/s: Git
    • Environment:

      Git version 2.4.6
      Win7 Ultimate X64
      SourceTree 1.6.18.0

      MergeTools:
      KDiff3 0.9.98
      BeyondCompare 3.3.14
      TortoiseMerge from TortoiseGit 1.8.15 (using git 2.4.6 as well)

    • Severity 2 - Major

      SourceTree does not start ANY MergeTool - unless which one I configure (BeyondCompare, KSIff3, TortoiseMerge). I even tried to configure KDiff3 as "Custom" MergeTool - without any success ...

      What happens when starting a MergeTool from Sourcetree:

      • Infobox pops up, saying external mergeTools is gonna be launched
      • The cursor changes to a dotted circle
      • The cursor changes back to normal
      • That's it - nothing else

      Hint:
      Within my Sourcecode-Folder a set of Files named basename_LOCAL*, basename_REMOTE*, basename_BASE* and basename_BACKUP* are created. Those files are not removed after MergeTool startup failure

            Assignee:
            Unassigned
            Reporter:
            Johannes Kilian
            Votes:
            6 Vote for this issue
            Watchers:
            10 Start watching this issue

              Created:
              Updated:
              Resolved: