Git Diff Between Two Files Into One