logoalt Hacker News

flamestroyesterday at 9:16 PM1 replyview on HN

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


Replies

insane_dreamertoday at 3:50 AM

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