Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-1590

Further help for wrong executables on assumed paths (Merge/Compare utilities)

    XMLWordPrintable

Details

    • Bug
    • Status: Gathering Impact (View Workflow)
    • Low
    • Resolution: Unresolved
    • None
    • None
    • None
    • None
    • Severity 3 - Minor

    Description

      From the blog (http://blog.sourcetreeapp.com/2013/05/07/sourcetree-for-mac-1-6/#comment-888864641):

      "I can't get Araxis Merge to work with an actual 3-way merge. Launching an external diff works properly, but the "Resolve Conflicts->Launch External Merge Tool..." just quickly opens the external merge window and then closes it. I also see the <filename>.orig files building up in the folder.</filename>"

      Author to provide more details.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              ksenior KieranA
              Votes:
              1 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated: