merge view demo
addon provides an interface for displaying and merging diffs,
or three-way. The left
(or center) pane is editable, and the differences with the other
pane(s) are optionally shown live as you edit it.
This addon depends on the google-diff-match-patch library to compute the diffs.