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-3473

Integration with External Merge broken for Kaleidoscope

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: High High
    • 2.2.3
    • 2.2
    • None
    • None

      Latest 2.2 (46) broke integration with external merge Kaleidoscope. When set Merge Tool to Kaleidoscope in settings .gitconfig file is broken:

      [mergetool "sourcetree"]
      	cmd = 
      

      cmd is empty instead of:

      cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
      

            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-3473

            Integration with External Merge broken for Kaleidoscope

              • Icon: Bug Bug
              • Resolution: Fixed
              • Icon: High High
              • 2.2.3
              • 2.2
              • None
              • None

                Latest 2.2 (46) broke integration with external merge Kaleidoscope. When set Merge Tool to Kaleidoscope in settings .gitconfig file is broken:

                [mergetool "sourcetree"]
                	cmd = 
                

                cmd is empty instead of:

                cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
                

                        Unassigned Unassigned
                        ba08cfbcb88d mmysliwiec_pgs
                        Votes:
                        3 Vote for this issue
                        Watchers:
                        5 Start watching this issue

                          Created:
                          Updated:
                          Resolved:

                            Unassigned Unassigned
                            ba08cfbcb88d mmysliwiec_pgs
                            Affected customers:
                            3 This affects my team
                            Watchers:
                            5 Start watching this issue

                              Created:
                              Updated:
                              Resolved: