Skip to content

Commit ce1810a

Browse files
committed
fix(actions): stage_all should also stage conflict files.
1 parent 4b57b6c commit ce1810a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lua/diffview/scene/views/diff/listeners.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ return function(view)
177177
stage_all = function()
178178
local args = vim.tbl_map(function(file)
179179
return file.path
180-
end, view.files.working)
180+
end, utils.vec_join(view.files.working, view.files.conflicting))
181181

182182
if #args > 0 then
183183
local success = view.adapter:add_files(args)

0 commit comments

Comments
 (0)