From 66d9403c8e5511b5469e1009534e8266296d64ed Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 13 Jan 2017 08:19:44 +0100
Subject: [PATCH] [merge addon] Fix incorrect compare
Issue #4492
---
addon/merge/merge.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index b3a9af405..a8132b605 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -431,7 +431,7 @@
var editOriginals = dv.mv.options.allowEditingOriginals;
copy.title = editOriginals ? "Push to left" : "Revert chunk";
copy.chunk = chunk;
- copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
+ copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
if (editOriginals) {
var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
--
GitLab