Description of resolving conflict 4 illustration

This figure shows the dialog that is displayed when Edit conflict as text is used. Two versions of the file are compared as plain text with the right side being editable.