Since upgrading to Mac OS X Lion I’ve found the following software on my System that no longer works.
Games & apps that require Rosetta (PowerPC compatibility)
- Age of Empires 2 Gold
- Baldur’s Gate 2
- Diablo 2
- DooM Legacy
- Railroad Tycoon 3
Games and apps that crash on start
- The Dig
- Indiana Jones and the Last Crusade
- Guitar Rig 4 64bit (patch expected soon)
On Mac OS X Git uses the opendiff(1) command line utility as its merge tool by default.
opendiff(1) will launch the FileMerge app that comes with XCode when performing merges. Unfortunately FileMerge is not a very good merge tool.
To improve this, there are a number of options. There are some good commercial, Open Source and freeware diff tools out there for Mac OS X such as DiffMerge, SureMerge, Araxis Merge, K3Diff, and p4merge, etc. Too many to list them all here.
For my system I chose p4merge. p4merge is part of the Perforce source control management system. I’ve used Perforce quite a lot in the past at previous jobs and it has great tools. Perforce is commercial software, and I’m not about to use Perforce as my source control system instead of Git, but fortunately you can download and use the Perforce GUI tools for free. The Perforce merge tool is not tied in any way to the Perforce SCM system so you can use it as a stand alone tool.
To set up p4merge as my mergetool with Git I did the following:
- Downloaded the Perforce Visual Client disk image from Perforce.com
- Installed p4merge into /Applications.
- Added the these settings to my ~/.gitconfig file.
Now git mergetool will launch p4merge as my preferred merge tool.
Now you may be wondering why I didn’t just set my Git merge.tool config setting to p4merge, as it is supported “by default” by Git. Well, Git expects the command p4merge to be in the $PATH and I’d rather not have to install shell scripts across the different Mac systems I use so that it works “out of the box”. I also found p4merge wasn’t dealing well with the relative paths that Git was trying to pass to it, hence the custom mergetool.custom.cmd setting that uses $PWD.
My father is a fairly in-experienced Mac OS X user. In order to help him out I decided to create some tutorial screen casts describing some of the features of Mac OS X he has trouble with or doesn’t know much about. I’m guessing that these screencasts might be useful to more people, so I’ll be posting them here via Vimeo.
Here is part one of a tutorial on Window Management in MacOS X.
You can watch in high definition on Vimeo.
I just found an essential MacOS X add-on.
One of the things I find annoying with the Mac is the fact that there are no keyboard shortcuts for window management beyond minimizing and hiding an application’s windows.
My desktop screen is larger in both size and resolution than my MacBook’s built in display. So when I’m travelling often I’ll open up an application, say iTunes for example, and the window will be larger than my screen can accomodate. The borders of the window and the resize grab handle will be off screen with no way for me to mouse to the right place and resize the window to fit.
Enter MercuryMover. This System Preference Pane provides customizable keyboard shortcuts and a nice little overlay GUI for manipulating windows with the keyboard. Now I don’t mind paying the $20 to buy this app because it is damn useful, but this sort of feature should really be built-in to MacOS X. Hopefully Apple will do that one day. I don’t hold out much hope though.
I’ve been using Firefox 3 for a day or so now. I’m liking it. It definately seems nippy. More so than Firefox 2. Not sure about the OS integrated look and feel though. Having not used Safari much I’m not used to MacOS X style buttons on web pages and such.
A good upgrade I think. Now I’m sure will come the torrent of patches. I wonder what point release number we’ll get to eventually…