Up git Street without a paddle

I recently updated OSX to El Capitain (10.11). Over all I think it’s a great update. Nothing stellar, but stabilises a lot of stuff from Mav.

It did stuff up my merge tool of choice in git though. I prefer diffmerge to the standard on OSX which is filemerge.

The fix took me a while to find, after trying a lot of suggestions on Stackoverflow.com.

Here it is just for you.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s