Fix DiffMerge opening then closing immediately on Mountain Lion.  Also make unidiff a little more robust (but still highly fragile).