Kdiff3: join B and C

Question

I use git and try to merge two branches. I use kdiff3 to solve conflicts. I have a conflict at the same line. I want to join changes from B and C. How to do this?

Answer 1

Click on both B and C buttons to accept line(s) from each.