[oneplane]

Sometimes when I want a visual representation I use Apple's FileMerge, but for everything else I just use diff and patch.