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

    • Bug
    • Resolution: Fixed
    • Medium
    • 1.4.0
    • 1.3.2
    • Git

    • Windows

    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

            sstreeting Steve Streeting (Inactive)
            1c77cac1b17b D K
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: