> Jerome's fix for calling diff on the Mac, which would previously > fail when interrupted. Good! I wouldn't be surprised if this helps with the problems I've experienced with merging as well... - Benjamin