Results 1 to 2 of 2
  1. #1
    Join Date
    Dec 2013
    Posts
    1

    Default Issues Configuring Git Difftool on Mac

    When trying to use git difftool on my Macbook Pro (Mavericks) i am only seeing the current version of the file on the right and not the original version.

    my git version is: 1.8.3.4 (Apple Git-47)

    When configured to use Kaleidescope, the diff works fine. But not with BC4. I also tried copying the same settings as Kaleidescope to BC4 but it still did not work.

    Could someone provide a working git config for Mac Mavericks? Also, would be nice if this could be auto-configured as Kaleidescope does.

    Below is a copy of my git config:

    [user]
    name = Matt Davis
    email = matt@datacodesolutions.com
    [difftool "Kaleidoscope"]
    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
    [difftool "bc3"]
    cmd = bcompare \"$LOCAL\" \"$REMOTE\"
    trustExitCode = true
    [difftool]
    prompt = false
    [diff]
    tool = bc3
    [core]
    excludesfile = /Users/mattcdavis1/.gitignore_global
    [mergetool "Kaleidoscope"]
    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
    trustExitCode = true
    [mergetool]
    prompt = false
    keepBackup = false
    [merge]
    tool = Kaleidoscope
    [color]
    ui = true
    [difftool "sourcetree"]
    cmd = opendiff \"$LOCAL\" \"$REMOTE\"
    path =
    [mergetool "sourcetree"]
    cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
    trustExitCode = true
    [pack]
    windowMemory = 100m
    SizeLimit = 100m
    threads = 1

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,379

    Default

    You will need to use the Beyond Compare menu -> Install Command Line Tools to get the necessary bcomp and bcompare tools. Beyond Compare.app will not work well from a VCS. We have Git (and other examples) here:
    http://www.scootersoftware.com/vbull...ad.php?t=11677
    Aaron P Scooter Software

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •