Comment by flamestro
17 hours ago
What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?
17 hours ago
What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?
yes, it shows the final merge (what was accepted from the left and right panels); very handy