A picture is perhaps worth at least a few hundred words...

http://i.imgur.com/VOlbMoy.png

icdiff seems to have the best defaults for me.