Check if file is still conflicted before opening diffview. Item may have

a conflict mode (UU, etc), but the markers were resolved, and it should
therefor no longer be considered for resolution.

Author: CKolkey

lua/neogit/buffers/status/actions.lua

@@ -1162,7 +1162,7 @@ M.n_stage = function(self)
       end
 
       if selection.item and selection.item.mode == "UU" then
-        if config.check_integration("diffview") then
+        if config.check_integration("diffview") and git.merge.is_conflicted(selection.item.escaped_path) then
           require("neogit.integrations.diffview").open("conflict", selection.item.name, {
             on_close = {
               handle = self.buffer.handle,