If disk space is no issue, a good difference format is just the entire original file and the entire new file.
If an editor was involved and you want better mergability you could include the original file and the sequence of CRDT ops.
If an editor was involved and you want better mergability you could include the original file and the sequence of CRDT ops.
The more changes, the more likely it is for a patch to fail, but in principle it seems like cherry-picking and applying a change is a valid use of a diff.