vimdiff is nice, but suffers from one major deficiency. It can't do three-way diffs.