lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-13 11:18:35 +08:00
Code Issues Projects Releases Wiki Activity

chore: fixed broken merge button

Browse Source
This commit is contained in:
Jamie Peabody
2022-01-03 20:20:24 +00:00
parent 095781c81a
commit 0c7fbe3572
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diff-view.js
View File

@@ -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 = [];