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

Integration with External Merge broken for Kaleidoscope

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved (View Workflow)
    • Priority: High
    • Resolution: Fixed
    • Affects Version/s: 2.2
    • Fix Version/s: 2.2.3
    • Component/s: None
    • Labels:
      None

      Description

      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
      

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Last commented:
                  3 years, 20 weeks, 5 days ago