From 0040187a8ec28faa51a2d94d2a946082c1a15aaa Mon Sep 17 00:00:00 2001
From: snadrus <snadrus@gmail.com>
Date: Tue, 7 Feb 2017 23:04:40 -0800
Subject: [PATCH] Simple export of functionality

Please try this (or something similar) and rebuild the NPM so 3-way-merge is available there.
---
 src/index.js | 2 ++
 1 file changed, 2 insertions(+)

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