diff3

Usage

vardiff3Merge=require('diff3');vara=['a','text','file'];varo=['a','test','file'];varb=['a','toasty','filtered','file'];vardiff3=diff3Merge(a,o,b);

Output

[{
"ok": ["a"]
}, {
"conflict": {
"a": ["text"],
"aIndex": 1,
"o": ["test"],
"oIndex": 1,
"b": ["toasty", "filtered"],
"bIndex": 1
}
}, {
"ok": ["file"]
}]