diff options
Diffstat (limited to 'pkg/integration/tests/conflicts/resolve_externally.go')
| -rw-r--r-- | pkg/integration/tests/conflicts/resolve_externally.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/integration/tests/conflicts/resolve_externally.go b/pkg/integration/tests/conflicts/resolve_externally.go index dec4ab7e2..a8d717351 100644 --- a/pkg/integration/tests/conflicts/resolve_externally.go +++ b/pkg/integration/tests/conflicts/resolve_externally.go @@ -8,7 +8,7 @@ import ( var ResolveExternally = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Ensures that when merge conflicts are resolved outside of lazygit, lazygit prompts you to continue", - ExtraCmdArgs: "", + ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { |