improve merge conflict flow

1 files changed, 10 insertions, 0 deletions

diff --git a/pkg/commands/git_commands/working_tree_test.go b/pkg/commands/git_commands/working_tree_test.go
index 8b2c70714..e4e884ce4 100644
--- a/pkg/commands/git_commands/working_tree_test.go
+++ b/pkg/commands/git_commands/working_tree_test.go
@@ -23,6 +23,16 @@ func TestWorkingTreeStageFile(t *testing.T) {
 	runner.CheckForMissingCalls()
 }
 
+func TestWorkingTreeStageFiles(t *testing.T) {
+	runner := oscommands.NewFakeRunner(t).
+		Expect(`git add -- "test.txt" "test2.txt"`, "", nil)
+
+	instance := buildWorkingTreeCommands(commonDeps{runner: runner})
+
+	assert.NoError(t, instance.StageFiles([]string{"test.txt", "test2.txt"}))
+	runner.CheckForMissingCalls()
+}
+
 func TestWorkingTreeUnstageFile(t *testing.T) {
 	type scenario struct {
 		testName string