Comment by insane_dreamer

16 hours ago

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.

3 comments

insane_dreamer

unfortunately for terminal lovers, the best .gitconfig snippet is still this:

  [diff]
    tool = intellij
  [difftool "intellij"]
    cmd = idea diff \"$LOCAL\" \"$REMOTE\"
  [merge]
    tool = intellij
  [mergetool "intellij"]
    cmd = idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true

flamestro 15 hours ago

What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?

insane_dreamer 8 hours ago

yes, it shows the final merge (what was accepted from the left and right panels); very handy