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

Merge using Beyond Compare does not work

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Medium
    • 2.2.1
    • 2.2
    • None
    • None

    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

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. SRCTREE-3524 Setting BeyondCompare as mergetool results in empty command line in git config

          • Medium - Medium priority issues
          • Closed
          is related to

          Bug - A problem which impairs or prevents the functions of the product. SRCTREE-3570 Beyond Compare merge still does not work in 2.2.2

          • Medium - Medium priority issues
          • Closed
          mentioned in

          Page Loading...

          Activity

            People

              Unassigned Unassigned
              5ac274b85483 Martin Løbger
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: