go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
Code Issues Releases Activity

fix PullMergeConflict integration test

Browse Source
This commit is contained in:
Jesse Duffield 2023-02-25 11:39:24 +11:00
parent db011d8e34
commit 037e957282
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View File

@ -119,6 +119,7 @@ var conflictStrings = []string{
"When you have resolved this problem",
"fix conflicts",
"Resolve all conflicts manually",
"Merge conflict in file",
}
func isMergeConflictErr(errStr string) bool {