We couldn't load all Actvitity tabs. Refresh the page to try again.
If the problem persists, contact your Jira admin.
IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.
Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-3644

SourceTree fails to launch external merge tool

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • None
    • 2.2.3
    • None
    • Severity 3 - Minor

      On git merge conflicts, ST fails to launch the external merge tool. Tried with FileMerge and Kaleidoscope and custom command. Neither works. The four files LOACL, BASE, REMOTE, BACKUP are created though.
      External diff works fine.

            Loading...
            IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.
            Uploaded image for project: 'Sourcetree For Mac'
            1. Sourcetree For Mac
            2. SRCTREE-3644

            SourceTree fails to launch external merge tool

            XMLWordPrintable

              • Icon: Bug Bug
              • Resolution: Fixed
              • Icon: Medium Medium
              • None
              • 2.2.3
              • None
              • Severity 3 - Minor

                On git merge conflicts, ST fails to launch the external merge tool. Tried with FileMerge and Kaleidoscope and custom command. Neither works. The four files LOACL, BASE, REMOTE, BACKUP are created though.
                External diff works fine.

                        Unassigned Unassigned
                        rrudnicki Renato Rudnicki (Inactive)
                        Votes:
                        18 Vote for this issue
                        Watchers:
                        18 Start watching this issue

                          Created:
                          Updated:
                          Resolved:

                            Unassigned Unassigned
                            rrudnicki Renato Rudnicki (Inactive)
                            Affected customers:
                            18 This affects my team
                            Watchers:
                            18 Start watching this issue

                              Created:
                              Updated:
                              Resolved: