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

Merge using Beyond Compare does not work

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved (View Workflow)
    • Priority: Medium
    • Resolution: Fixed
    • Affects Version/s: 2.2
    • Fix Version/s: 2.2.1
    • Component/s: None
    • Labels:
      None
    • Last commented by user?:
      true

      Description

      When selecting Beyond Compare as merge tool, SourceTree returns immediately when trying to merge - Beyond Compare is never launched.

      Using "Custom..." merge tool with these setitngs works:
      Merge Command: /usr/local/bin/bcomp
      Arguments: "$LOCAL" "$REMOTE" "$BASE" "$MERGED"

      As a side note: Beyond compare as diff tool works just fine.

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Last commented:
                  3 years, 18 weeks ago