For OS X take a look at zsCompare from Zizasoft. I have used it to apply the 1.2.4.1 and 1.2.5 upgrades, a number of contributions, and to migrate files from my development environment to my test...