Changes between Version 13 and Version 14 of Help/Dialog/Conflict


Ignore:
Timestamp:
2020-01-28T04:21:24+01:00 (6 years ago)
Author:
skyper
Comment:

added link to conflict list dialog

Legend:

Unmodified
Added
Removed
Modified

  • Help/Dialog/Conflict

    v13 v14  
    8787* Resolve conflicts by opening the 'conflicts' panel, selecting the one of the listed conflicts and choosing whether to accept 'theirs' or 'mine'.
    8888
     89== See also ==
     90* [wikitr:/Help/Dialog/ConflictList Conflict List Dialog]
     91
    8992----
    9093Back to [wikitr:/Help/Concepts/Conflict Conflict][[BR]]