diff3 & merge

diff - compare two files
diff3 - compare three files

merge - three-way file merge

• merge [ options ] file1 file2 file3
• merge incorporates all changes that lead from file2 to file3 into file1.
• Suppose file2 is the original, and both file1 and file3 are modifications of file2. Then merge combines both changes.