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

External Merge Tool does not open in all cases

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Medium
    • Resolution: Fixed
    • Affects Version/s: 1.3.2
    • Fix Version/s: 1.4.0
    • Component/s: Git
    • Labels:
    • Environment:

      Windows

    • Last commented by user?:
      true

      Description

      I can reproduce this issue with the Merge Tool set to System Default or P4Merge.

      I have a script below to reproduce.

      • The script creates a Git repo with a merge conflict.
      • Open the repo in SourceTree and then right-click data.txt > Resolve Conflicts > Launch External Merge Tool.

      https://gist.github.com/dkirrane/7581863

      I don't have an issue opening the BASE, LOCAL, REMOTE files directly in P4Merge.

        Attachments

          Activity

            People

            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:
                Last commented:
                5 years, 32 weeks, 6 days ago