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

Add support for Meld diff/merge tool

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • None
    • None
    • None
    • Standalone version of SourceTree on Mac (and Windows – see #SRCTREEWIN-6666).
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

    Description

      Add built-in support for Meld diff/merge tool to SourceTree in the Diff options/preferences dialog.

      I currently have to set `External Diff Tool` to `Custom` and the following.

      Command = /Applications/Meld.app/Contents/MacOS/Meld

      Arguments = "$LOCAL" "$REMOTE"

      The above could possibly do with some back-slahses for robustness?

      For `External Merge Tool`:

      Arguments = "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output="$MERGED"

      Attachments

        1. diff-mergee-git.png
          diff-mergee-git.png
          158 kB
        2. diff-merge-sourcetree.png
          diff-merge-sourcetree.png
          200 kB

        Activity

          People

            Unassigned Unassigned
            210c860bec57 BrendanSimon
            Votes:
            7 Vote for this issue
            Watchers:
            6 Start watching this issue

            Dates

              Created:
              Updated: