sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-04 23:42:10 +03:00
Code Activity

Reenable failing test

Browse Source
This commit is contained in:
Stefan Haller
2023-02-25 14:06:00 +01:00
parent a68cd6af9c
commit bf6e9a1bd3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/patch_building/move_to_index_with_conflict.go
View File

@@ -8,7 +8,7 @@ import (
var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Move a patch from a commit to the index, causing a conflict", Description: "Move a patch from a commit to the index, causing a conflict",
ExtraCmdArgs: "", ExtraCmdArgs: "",
Skip: true, // Skipping until https://github.com/jesseduffield/lazygit/pull/2471 is merged Skip: false,
SetupConfig: func(config *config.AppConfig) {}, SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) { SetupRepo: func(shell *Shell) {
shell.CreateFileAndAdd("file1", "file1 content") shell.CreateFileAndAdd("file1", "file1 content")