/
githubmirror
/
lazygit
Обзор
Документация
Войти
/
githubmirror
/
lazygit
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
master
pkg/integration/tests/conflicts/pick_both_hunks_diff3.go
43 строки
1 KB
Stefan Haller
Only prompt to continue a rebase/merge if we started it
03 июл 2026, 19:28
03 июл 2026, 19:28
ad507d6
Код
Авторство
О чём код?
package conflicts import ( "github.com/jesseduffield/lazygit/pkg/config" . "github.com/jesseduffield/lazygit/pkg/integration/components" "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" ) var PickBothHunksDiff3 = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Pick both hunks of a conflict rendered in the diff3 style; the common ancestor must not be included", ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.SetConfig("merge.conflictStyle", "diff3") shared.CreateMergeConflictFile(shell) }, Run: func(t *TestDriver, keys config.KeybindingConfig) { t.Common().PretendMergeOrRebaseStartedInLazygit() t.Views().Files(). IsFocused(). Lines( Contains("UU file").IsSelected(), ). PressEnter() t.Views().MergeConflicts(). IsFocused(). // the diff3 style renders the common ancestor between the two changes Content(Contains("<<<<<<< HEAD\nFirst Change")). Content(Contains("||||||| ")). Content(Contains("Original")). Press(keys.Main.PickBothHunks) t.Common().ContinueOnConflictsResolved("merge") t.Views().Files().IsEmpty() t.FileSystem().FileContent("file", Equals("\nThis\nIs\nThe\nFirst Change\nSecond Change\nFile\n")) }, })