Launch External Merge Tool launches wrong tool

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: High
    • 3.0.8, 3.0.15
    • Affects Version/s: 3.0.5
    • Component/s: Git
    • None
    • Environment:

      Actually 3.0.6

    • Severity 2 - Major

      I have two different tools for (external) merging and diffing:

      • WinMerge (for diffing)
      • KDiff3 (for merging)

      When rebasing or merging, and a conflict occurs, I select Resolve Conflicts => Launch External Merge Tool via context menu.

      However, while SourceTree sets up everything for merging (i.e. creates the base, local, remote files), it then launches WinMerge (i.e. my diff tool), which doesn't know what to do with those files. Upon closing WinMerge, SourceTree then considers the merge done, and neither "Restart Merge" nor "Mark Unresolved" do anything.

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

              Created:
              Updated:
              Resolved: