diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-02-25 14:06:00 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-03-07 09:49:34 +0100 |
| commit | bf6e9a1bd3f7a3084644b3658264631b156d725c (patch) | |
| tree | add00bc4f1cf6283f1f19f3de015445351f97091 /pkg/integration | |
| parent | a68cd6af9c572a83cbaf511a72b8a89c1d534e0b (diff) | |
Reenable failing test
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/tests/patch_building/move_to_index_with_conflict.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/integration/tests/patch_building/move_to_index_with_conflict.go b/pkg/integration/tests/patch_building/move_to_index_with_conflict.go index bdeb321c4..75ecff9a4 100644 --- a/pkg/integration/tests/patch_building/move_to_index_with_conflict.go +++ b/pkg/integration/tests/patch_building/move_to_index_with_conflict.go @@ -8,7 +8,7 @@ import ( var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Move a patch from a commit to the index, causing a conflict", ExtraCmdArgs: "", - Skip: true, // Skipping until https://github.com/jesseduffield/lazygit/pull/2471 is merged + Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.CreateFileAndAdd("file1", "file1 content") |