lazygit/test/integration/pullMergeConflict/test.json

{ "description": "When user has configured pull with merge, ensure we handle conflicts", "speed": 5 }