Changes between Version 4 and Version 5 of Help/Dialog/ConflictList


Ignore:
Timestamp:
2009-10-07T21:33:56+02:00 (16 years ago)
Author:
Gubaer
Comment:

minor edits

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/ConflictList

    v4 v5  
    1313[[Image(conflict-list-dialog-commented.png)]] [[BR]]
    1414
    15  * The Conflict List Dialog displays a list of conflict. You can select a conflict by clicking on it.
     15 * The Conflict List Dialog displays a list of conflicts. You can select a conflict by clicking on it.
    1616
    17  * Click on '''Resolve''' to launch the [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict.
     17 * Click '''Resolve''' to launch the [wiki:/Help/Dialog/ConflictDialog Conflict Dialog] for the selected conflict. The Conflict Dialog is used to resolve the conflict.
    1818
    19  * Click on '''Select''' to select the object which the currently selected conflict has been generated for.
     19 * Click '''Select''' to select the object which the currently selected conflict has been generated for.
    2020   - Use [[Image(source:/trunk/images/dialogs/autoscale/selection.png)]] '''View -> Zoom to selection''' if is the selected element is not visible in the current view.
    2121