Conflict Solver Window

With the left two tool bar buttons you can navigate from conflict to conflict. The right two tool bar buttons allow to take either the left or right solution of the conflict. If necessary, you can also edit directly in the resulting document at the bottom. Use the first four View menu items to define where the three displayed file contents should be placed.