From 0c7fbe35727bbfd86b39d389c387980618a3a8ce Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jpeabody@axway.com>
Date: Mon, 3 Jan 2022 20:20:24 +0000
Subject: [PATCH] chore: fixed broken merge button

---
 src/diff-view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/diff-view.js b/src/diff-view.js
index 3a3c66d..6a52b5f 100644
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -1196,7 +1196,7 @@ CodeMirrorDiffView.prototype._markupLineChanges = function (changes) {
 	const rhsvp = this._get_viewport_side('rhs');
 
 	const getMergeHandler = (change, side, oside) => {
-		return () => this._merge_change(change, 'lhs', 'rhs');
+		return () => this._merge_change(change, side, oside);
 	}
 
 	this._unbindHandlersOnClear = [];