CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-20 10:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7667 from openstreetmap/dependabot/npm_and_yarn/node-diff3-2.0.1

Browse Source 
Bump node-diff3 from 1.0.0 to 2.0.1
This commit is contained in:
Quincy Morgan
2020-06-04 19:17:13 -04:00
committed by GitHub
parent 67b71dd872 fcc21ce856
commit bb55d9082f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/actions/merge_remote_changes.js
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];

2
package.json
View File

@@ -57,7 +57,7 @@
"lodash-es": "~4.17.15",
"marked": "0.8.0",
"martinez-polygon-clipping": "0.6.2",
"node-diff3": "1.0.0",
"node-diff3": "2.0.1",
"osm-auth": "1.0.2",
"pannellum": "2.5.6",
"rbush": "3.0.1",