X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=to-be-integrated%2Fthird-party%2Fcodemirror-3.15%2Fdemo%2Fmerge.html;fp=to-be-integrated%2Fthird-party%2Fcodemirror-3.15%2Fdemo%2Fmerge.html;h=907f769d579ba581fd8b91bc0b5b61e45da1ca6d;hb=31540dd504798e0aca69e10d8144fbedc5b16af8;hp=0000000000000000000000000000000000000000;hpb=937653fd70bbf7d95bcf870e7f2b46b4a8fec486;p=myslice.git diff --git a/to-be-integrated/third-party/codemirror-3.15/demo/merge.html b/to-be-integrated/third-party/codemirror-3.15/demo/merge.html new file mode 100644 index 00000000..907f769d --- /dev/null +++ b/to-be-integrated/third-party/codemirror-3.15/demo/merge.html @@ -0,0 +1,63 @@ + +
+ + + + + + + + +The merge
+addon provides an interface for displaying and merging diffs,
+either two-way
+or three-way. The left
+(or center) pane is editable, and the differences with the other
+pane(s) are shown live as you edit it.
This addon depends on +the google-diff-match-patch +library to compute the diffs.
+ +