Support

If you have any issues with MxDiff, please feel free to email us at mxdiff@rufwork.com.

FAQ (Click to expand answers)

Why do I keep seeing a file selection dialog saying "Choose a folder containing this file:"? It's annoying!

TL;DR: It's the app sandbox keeping you safe. Select as far up the folder chain as possible and it will happen much less frequently.

So if git is creating new files in...

/var/folders/cx/f9dw16rj6_j_ym_lykqfjmq00000gp/T/git-blob-6LP4y2

you can select git-blob-6LP4y2 and give one-time permission. (The folder name changes essentially every diff.)

But you can select...

/var/folders/cx/f9dw16rj6_j_ym_lykqfjmq00000gp/T/

or even..

/var/folders/cx/

or...

/var/

and potentially never have to give permission again!

Hey, that wasn't too long! Let me read that again in more detail!

Because MxDiff is distributed via the Mac App Store, it's "sandboxed". This is great, because it helps ensure that your apps don't look anywhere you haven't expressly told them they can. So MxDiff can't read any files on your Mac until you prove that you want it to.

The downside is that the git difftool command creates temporary files for comparisons. If you're comparing an uncommited file to its previous version, one temporary file is created. If you're looking at how a file has changed between two commits, that's two files in two different weirdly named directories.

But even worse, each file gets puts into its own strangely named folders. These wonderfully creative paths end up looking like...

/var/folders/cx/f9dw16rj6_j_ym_lykqfjmq00000gp/T/git-blob-6LP4y2/style.css

The sandbox sees this path and says, "I know my user has never told me it's okay for MxDiff to look at the git-blob-6LP4y2 folder. I'm going to require they use a file dialog to select it first."

And so when you diff, you get asked to pick a folder that contains that file. Then the sandbox says, "Oh, my user picked git-blob-6LP4y2. Open away, MxDiff!"

And there's the trick: Because git always uses the same parent folders to put these weirdly named directories in, you can tell the sandbox, "Hey, let's green light anything found in the parent folder."

In the example here, you can select that T folder and be safe for most if not all git difftool calls. But if you really want to make it stop, selecting var means nothing there will throw again... at least until that folder "bookmark" expires.

Same thing anywhere else on your system. You can select your Documents folder or Applications or whatever you'd like.

The only downside is if you don't trust MxDiff. Sad face, of course, but the worse case is you just smack the return key once or twice every time your diff something. Not horrible at all, honestly.

How do I use this as my git difftool?

NOTE: You must have opened MxDiff at least once so it can register itself before this will work.

You should have a file called .gitconfig in your home folder. If that's confusing, type nano ~/.gitconfig in the terminal and you should see its contents, ready for edit.

Look for a line in .gitconfig that starts with [difftool]. You may also have entries that start with [difftool " and then define a tool to use in certain situations, like the following (for the visual git tool SourceTree in this case):

[difftool "sourcetree"]
    cmd = open -W mxdiff:$(pwd)/-.-/$LOCAL/-.-/$REMOTE

You DON'T want to replace that to register MxDiff with git on the command-line. You want to find your generic entry like this:

[difftool]
    cmd = /usr/local/bin/bbdiff --resume --reverse --wait \"$LOCAL\" \"$REMOTE\"
    path =

Change that to this -- or, if you didn't have that line, insert this at the bottom of .gitconfig's contents.

[difftool]
    cmd = open -W mxdiff:$(pwd)/-.-/$LOCAL/-.-/$REMOTE
    path =

The path = line is not required. If it has a value after =, remove either the value or the entire path setting.

Come on, the diff display for these two versions of my file is WACK. It misses where they're the same, gets lazy, and reports back a giant block instead. Disaster.

Now you're talking my language! If you can, send both files or file versions to mxdiff@rufwork.com with a subject of "Wack diff" (no quotes).

A big reason I wrote this thing is because of how annoyed I get when difftools get diffs "wrong" just like that. MxDiff currently is sort of "table stakes" to be able to play at difftools, but step 2 is customizing how the diffs are made.

What's the privacy policy?

You can view the privacy policy at this link. Let me know if you have any concerns!

Contact

If you have any issues with MxDiff, please feel free to email us at mxdiff@rufwork.com.