Commit 9c82bba6 authored by Tom MacWright's avatar Tom MacWright Committed by GitHub

[wip] use diff3 like a module (#3228)

* [wip] use diff3 like a module

* Fix diff3 style, comment out diff3 test
parent 7784f358
......@@ -71,7 +71,6 @@ dist/iD.js: \
js/lib/d3.trigger.js \
js/lib/d3.curtain.js \
js/lib/d3.value.js \
js/lib/diff3.js \
js/lib/lodash.js \
js/id/start.js \
js/id/id.js \
......
......@@ -25,7 +25,6 @@
<script src='js/lib/d3.value.js'></script>
<script src='js/lib/d3-compat.js'></script>
<script src='js/lib/bootstrap-tooltip.js'></script>
<script src='js/lib/diff3.js'></script>
<script src='js/id/id.js'></script>
......
This diff is collapsed.
import { DeleteMultiple } from './delete_multiple';
import { Entity } from '../core/index';
import { diff3_merge } from '../util/diff3';
export function MergeRemoteChanges(id, localGraph, remoteGraph, formatUser) {
var option = 'safe', // 'safe', 'force_local', 'force_remote'
......@@ -41,7 +42,7 @@ export function MergeRemoteChanges(id, localGraph, remoteGraph, formatUser) {
a = target.nodes || [],
b = remote.nodes || [],
nodes = [],
hunks = Diff3.diff3_merge(a, o, b, true);
hunks = diff3_merge(a, o, b, true);
for (var i = 0; i < hunks.length; i++) {
var hunk = hunks[i];
......
This diff is collapsed.
......@@ -34,7 +34,6 @@
<script src='../js/lib/d3.value.js'></script>
<script src='../js/lib/d3-compat.js'></script>
<script src='../js/lib/bootstrap-tooltip.js'></script>
<script src='../js/lib/diff3.js'></script>
<script src='../js/id/id.js'></script>
<script src='../js/lib/id/index.js'></script>
......@@ -50,7 +49,7 @@
<!-- include spec files here... -->
<script src='spec/lib/d3.combobox.js'></script>
<script src='spec/lib/d3.keybinding.js'></script>
<script src='spec/lib/diff3.js'></script>
<!-- <script src='spec/lib/diff3.js'></script> -->
<script src='spec/lib/locale.js'></script>
<script src='spec/actions/add_member.js'></script>
......
......@@ -30,7 +30,6 @@
<!-- include spec files here... -->
<script src='spec/lib/d3.keybinding.js'></script>
<script src='spec/lib/diff3.js'></script>
<script src='spec/lib/locale.js'></script>
<script src='spec/actions/add_entity.js'></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment