CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 05:30:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update node-diff3 API calls for v2.0.0

Browse Source
This commit is contained in:
Quincy Morgan
2020-06-04 19:16:49 -04:00
parent cd3671c640
commit fcc21ce856
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/actions/merge_remote_changes.js
+1 -1
View File
@@ -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];