(hunk, offset)
| 1240 | } |
| 1241 | |
| 1242 | function cloneHunk(hunk, offset) { |
| 1243 | return { |
| 1244 | oldStart: hunk.oldStart, |
| 1245 | oldLines: hunk.oldLines, |
| 1246 | newStart: hunk.newStart + offset, |
| 1247 | newLines: hunk.newLines, |
| 1248 | lines: hunk.lines |
| 1249 | }; |
| 1250 | } |
| 1251 | |
| 1252 | function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) { |
| 1253 | // This will generally result in a conflicted hunk, but there are cases where the context |