Hacker News new | ask | show | jobs
by flamestro 115 days ago
What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?
1 comments

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