##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 :
-
Notifications
You must be signed in to change notification settings - Fork 0
yaneryou/merge
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
The merge provides an interface for displaying and merging diffs, either two-way or three-way in ace
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published