Support `merge.conflictStyle diff3` #940 by Ryooooooga · Pull Request #1447 · jesseduffield/lazygit
#940 I would also like your opinion on the naming. before after
github.com