jarvis reborn as dupin: http://dc.wikia.com/wiki/Batcomputer

(I name macbooks according to the decals)
Using P4Merge instead of Diffmerge. - opensource and free.

Diffmerge seems to have become nagware.