Crash using external tool p4merge or semanticmerge for merging conflicts

XMLWordPrintable

    • Type: Bug
    • Resolution: Duplicate
    • Priority: High
    • None
    • Affects Version/s: 1.8.2
    • Component/s: None
    • Environment:

      Windows 7 x64

      I configured .git to use p4merge or semanticmerge for merging conflicts.

      When I say to source tree to use the external tool, when I finished to merge my differences and I close the tool saving the file, source tree at that point crashes.

      If, before saving, I press abort in source tree and then I save the file, it works as expected.

              Assignee:
              Unassigned
              Reporter:
              qlikTERror
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: