we need something like this in lazygit -- which is excellent all around but lacking in visual diffing/merging.
What is most useful though is a 3-panel setup, like JetBrains -- still the best git client I have worked with.
What is most useful though is a 3-panel setup, like JetBrains -- still the best git client I have worked with.
[diff]
tool = intellij
[difftool "intellij"]
cmd = idea diff \"$LOCAL\" \"$REMOTE\"
[merge]
tool = intellij
[mergetool "intellij"]
cmd = idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true