Thank you for the clarification!
To expand on the Vim Tip, the `do` command stands for "diff obtain" or "diff get", which retrieves the text from the file in the other window within Vimdiff mode and replaces the text in the current window with it.
The `dp` command stands for "diff put", which do...