From 2fa28df7789d88b0b22454dd1d894467bbf210cf Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jpeabody@axway.com>
Date: Sun, 2 Jan 2022 11:46:41 +0000
Subject: [PATCH] chore: fixed merge button

---
 src/diff-view.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/diff-view.js b/src/diff-view.js
index 39e5cf6..6ec5678 100644
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -1212,11 +1212,11 @@ CodeMirrorDiffView.prototype._merge_change = function(change, side, oside) {
 	const ed = { lhs: led, rhs: red };
 	const from = change[`${side}-line-from`];
 	const to = change[`${side}-line-to`];
-	const ofrom = change[`${oside}-line-from`];
+	let ofrom = change[`${oside}-line-from`];
 	const oto = change[`${oside}-line-to`];
 	const doc = ed[side].getDoc();
 	const odoc = ed[oside].getDoc();
-	const fromlen = from >= 0 ? doc.getLine(from).length + 1 : 0;
+	let fromlen = from >= 0 ? doc.getLine(from).length + 1 : 0;
 	const tolen = to >= 0 ? doc.getLine(to).length + 1 : 0;
 	const otolen = oto >= 0 ? odoc.getLine(oto).length + 1 : 0;
 	const ofromlen = ofrom >= 0 ? odoc.getLine(ofrom).length + 1 : 0;