From fcc21ce856129f6323f775d4829fd503a9c990f0 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Thu, 4 Jun 2020 19:16:49 -0400
Subject: [PATCH] Update node-diff3 API calls for v2.0.0

---
 modules/actions/merge_remote_changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/actions/merge_remote_changes.js b/modules/actions/merge_remote_changes.js
index 07b76facb..ee4d1d143 100644
--- a/modules/actions/merge_remote_changes.js
+++ b/modules/actions/merge_remote_changes.js
@@ -49,7 +49,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
         var a = target.nodes || [];
         var b = remote.nodes || [];
         var nodes = [];
-        var hunks = diff3Merge(a, o, b, true);
+        var hunks = diff3Merge(a, o, b, { excludeFalseConflicts: true });
 
         for (var i = 0; i < hunks.length; i++) {
             var hunk = hunks[i];