I sync my org files via Dropbox. Occasionally, Dropbox will bring in changes into a file whose buffer I've already modified. I can diff the buffer and the file on disk with
diff-buffer-with-file; but then what?
Theoretically it's a
diff minor mode file, so I should be able to use diff functions such as
(diff-apply-hunk), but in practice a get an elisp stack trace.
What am I doing wrong? Is there a better approach?