liuxm/Mergely
1
0
Fork 0
forked from lxm_front/Mergely
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes issue where merge left, from added lines, were not being correctly inserted into the lhs.

Browse Source
This commit is contained in:
Jamie Peabody
2013-06-13 19:35:26 +01:00
parent 0cd70a833f
commit 09c9e31a0d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mergely.js
View File

@@ -1158,9 +1158,9 @@ jQuery.extend(Mgly.mergely.prototype, {
{ line: change[oside + '-line-to'], ch: line[oside].text.length });
}
else if (change['op'] == 'a') {
ed[oside].replaceRange( text + '\n',
{ line: change[oside + '-line-from'], ch: 0 },
{ line: change[oside + '-line-to'], ch: 0 });
ed[oside].replaceRange( '\n' + text,
{ line: change[oside + '-line-from'], ch: line[oside].text.length },
{ line: change[oside + '-line-to'], ch: line[oside].text.length });
}
else {// 'd'
var from = parseInt(change[oside + '-line-from']);