diff --git a/src/index.js b/src/index.js index 5c6340a4..a1535824 100644 --- a/src/index.js +++ b/src/index.js @@ -27,6 +27,7 @@ import {diffArrays} from './diff/array'; import {applyPatch, applyPatches} from './patch/apply'; import {parsePatch} from './patch/parse'; +import {merge} from './patch/merge'; import {structuredPatch, createTwoFilesPatch, createPatch} from './patch/create'; import {convertChangesToDMP} from './convert/dmp'; @@ -53,6 +54,7 @@ export { applyPatch, applyPatches, parsePatch, + merge, convertChangesToDMP, convertChangesToXML, canonicalize