Added support for MOVE-DETECTION and also changed the format of diffs used in merge.js
Adding explanation of what was changed to support move detection