Actions: jesseduffield/lazygit
Actions
Showing runs from all workflows
2,500+ workflow runs
2,500+ workflow runs
merge.conflictStyle diff3 makes [b] "pick both" also add the deleted merge-base lines
Close Issues
#3149:
Issue comment #5486 (comment)
created
by
stefanhaller
ProTip!
You can narrow down the results and go further in time using created:<2026-07-01 or the other filters available.