jesseduffield / jesseduffield/lazygit

ignore `conflictstyle ` in git config when rendering merge panel

Open
#940 2 comments 0 reactions 0 assignees View on GitHub
bug git-config
Dominant language
Go
Stars
82.4k
Forks
3k
Avg merge
2d 18h
Merged PRs (30d)
19

Description

see https://github.com/jesseduffield/lazygit/issues/939.

We should override this config value when obtaining the diff for the merge panel.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.