We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0fb17df commit dc94b0fCopy full SHA for dc94b0f
addon/merge/merge.js
@@ -431,10 +431,10 @@
431
var editOriginals = dv.mv.options.allowEditingOriginals;
432
copy.title = editOriginals ? "Push to left" : "Revert chunk";
433
copy.chunk = chunk;
434
- copy.style.top = top + "px";
+ copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
435
436
if (editOriginals) {
437
- var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
+ var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
438
var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
439
"CodeMirror-merge-copy-reverse"));
440
copyReverse.title = "Push to right";
0 commit comments