From 09c9e31a0decaaf1e8c49790254629c0e493e9af Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Thu, 13 Jun 2013 19:35:26 +0100 Subject: [PATCH] Fixes issue where merge left, from added lines, were not being correctly inserted into the lhs. --- lib/mergely.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mergely.js b/lib/mergely.js index 21abb45..16ca4e4 100644 --- a/lib/mergely.js +++ b/lib/mergely.js @@ -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']);