merge view demo合并视图演示文档
The merge
addon provides an interface for displaying and merging diffs, either two-way or three-way.merge
插件提供了一个接口,用来显示差异、合并差异,既可以是双向,也可以是三向。
The left (or center) pane is editable, and the differences with the other pane(s) are optionally shown live as you edit it. 左侧(或中间)的面板是可编辑的,与其它面板的差异会随着编辑视情况实时显示。
In the two-way configuration, there are also options to pad changed sections to align them, and to collapse unchanged stretches of text.在双向配置中,还存在配置项,来衬托已修改部分,以对齐它们,并折叠未修改的文本。
This addon depends on the google-diff-match-patch library to compute the diffs.此附件依赖于google-diff-match-patch库以计算区别。