I'd like to merge two files by doing the following:
"I want to output the entire file in a unified format. Is there any way diff can do this?"
diff -U 9999999 file1.txt file2.txt > diff.txt
This should work, provided your files are less than 10 million lines long.