##2/3-way Merge in ace
The merge provides an interface for displaying and merging diffs, either two-way or three-way. I do it based on merge addon of codemirror, and make it apply to ace.
Merge depends on :
| Name | Name | Last commit date | ||
|---|---|---|---|---|
##2/3-way Merge in ace
The merge provides an interface for displaying and merging diffs, either two-way or three-way. I do it based on merge addon of codemirror, and make it apply to ace.
Merge depends on :