dq seems to leave the wrong buffer open after :Gvdiffsplit!

[gwerbin]

After invoking :Gvdiffsplit! or dv in the Git buffer, everything works as expected. However, when I return to the same Git buffer and invoke dq, the fugitive://...//2/... buffer is left in the remaining window, not the original buffer of the file I was diffing.

I am using a somewhat-outdated Neovim dev release (v0.10.0-dev-482+g38b0bb) and Fugitive commit 43f18ab9155c853a84ded560c6104e6300ad41da.

It seems to occur reliably in the repo I happen to be working on if I follow the following steps:

1. Start Neovim in the project's top-level directory (also the Git repo top level)
2. Invoke :Git to open the Git buffer in a new window. Switch to it and run :25wincmd _ and :setl winfixheight.
3. Choose an unstaged file with merge conflicts (UU in git status --short), and invoke dv.
4. Fix conflicts. Run :w in the middle window, and and then :Git add % (or s in the Git buffer).
5. Switch back to the Git buffer window, and invoke dq.

Let me know if there's any other information I can provide to help reproduce the issue.