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

chore: fixed merge button

Browse Source
This commit is contained in:
Jamie Peabody
2022-01-02 11:46:41 +00:00
parent b5561211dd
commit 2fa28df778
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff-view.js
View File

@@ -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;