diff3

  The diff3 program compares 3 files at one time, and it outputs a report, or it can optionally merge the files. The format of the command is:

 diff3 [options] Mine Older Yours

Where Older is assumed to be the original file that Mine and Yours are derived from.