(hunk, mine, their, swap)
| 1337 | } |
| 1338 | |
| 1339 | function removal(hunk, mine, their, swap) { |
| 1340 | var myChanges = collectChange(mine), |
| 1341 | theirChanges = collectContext(their, myChanges); |
| 1342 | |
| 1343 | if (theirChanges.merged) { |
| 1344 | var _hunk$lines6; |
| 1345 | |
| 1346 | (_hunk$lines6 = hunk.lines).push.apply(_hunk$lines6, _toConsumableArray(theirChanges.merged)); |
| 1347 | } else { |
| 1348 | conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges); |
| 1349 | } |
| 1350 | } |
| 1351 | |
| 1352 | function conflict(hunk, mine, their) { |
| 1353 | hunk.conflict = true; |
no test coverage detected