Display conflict information inside unified diff

Last modified by Simon Urli on 2019/08/19

The display diff API allows to display information about conflicts.
The APIs to build unified diff takes as input a list of conflict elements that have been computed during a merge: some conflict information are then available in the resulting unified diff blocks, and can be used to present conflicts and possible decisions inside an UI presenting unified diff.

Tags:
Created by Simon Urli on 2019/08/19
   

Get Connected