Description of resolving conflicts 3 illustration

This figure shows the dialog that is displayed when Edit Conflict is used. If the file is recognized as an object, then the content (of both branches) will be displayed as objects.