top | item 47172107

(no title)

flamestro | 3 days ago

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

discuss

order

insane_dreamer|3 days ago

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