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

patch(issue #115): fixes merging deleted line(s) from lhs would munge rhs text (#117)

Browse Source 
* patch(issue #115): fixes merging deleted line(s) from lhs would munge rhs text

* updated readme
This commit is contained in:
Jamie Peabody
2019-07-14 12:54:01 +01:00
committed by GitHub
parent 788c5ad17b
commit 90ab7f3f5e
4 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/mergely.spec.js
View File

@@ -396,6 +396,54 @@ describe('mergely', function () {
rhs: 'a\nb\nx\nc',
dir: 'rhs',
name: 'merge rhs line 3 of length 1 and insert after line 2 of lhs'
},
{
lhs: '\ngood',
rhs: 'good',
dir: 'rhs',
name: 'lhs has deleted line at start'
},
{
lhs: '\na\nb\nc\ngood',
rhs: 'good',
dir: 'rhs',
name: 'lhs has multiple deleted lines at start'
},
{
lhs: 'good\n',
rhs: 'good',
dir: 'rhs',
name: 'lhs has deleted line at end (issue #115)'
},
{
lhs: 'good\na\nb\nc',
rhs: 'good',
dir: 'rhs',
name: 'lhs has multiple deleted lines at end (issue #115)'
},
{
lhs: 'good',
rhs: '\ngood',
dir: 'lhs',
name: 'rhs has added line at start'
},
{
lhs: 'good',
rhs: '\na\nb\nc\ngood',
dir: 'lhs',
name: 'rhs has multiple added lines at start'
},
{
lhs: 'good',
rhs: 'good\n',
dir: 'lhs',
name: 'rhs has added line at end'
},
{
lhs: 'good',
rhs: 'good\na\nb\nc',
dir: 'lhs',
name: 'rhs has multiple added lines at end'
}];
opts.forEach((opt, i) => {