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

migrate revert merge test

Browse Source
This commit is contained in:
Jesse Duffield
2023-02-19 14:47:07 +11:00
parent 88c76868ba
commit b5e325b0a4
43 changed files with 68 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/integration/tests/shared/conflicts.go
View File

@ -47,3 +47,11 @@ var MergeConflictsSetup = func(shell *Shell) {
EmptyCommit("second-change-branch unrelated change").
Checkout("first-change-branch")
}
var CreateMergeCommit = func(shell *Shell) {
MergeConflictsSetup(shell)
shell.RunShellCommandExpectError("git merge --no-edit second-change-branch")
shell.UpdateFileAndAdd("file", SecondChangeFileContent)
shell.ContinueMerge()
}