External Merge Tool does not open in all cases

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Medium
    • 1.4.0
    • Affects Version/s: 1.3.2
    • Component/s: Git
    • Environment:

      Windows

      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.

            Assignee:
            Steve Streeting (Inactive)
            Reporter:
            D K
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved: