It used to be that when I did an external diff (using BBEdit), the local file was actually used as one side of the comparison, so I could edit right there in the external diff application (BBEdit).
Now, unfortunately, both sides are temporary copies in /private/var/folders. I regard this as a bug, because it removes an important piece of functionality. Or is there a secret setting for returning to the old behavior?