LukasMeine /
vigilance
| @@ 8443-8443 (lines=1) @@ | ||
| 8440 | }; |
|
| 8441 | } |
|
| 8442 | ||
| 8443 | function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) { |
|
| 8444 | // This will generally result in a conflicted hunk, but there are cases where the context |
|
| 8445 | // is the only overlap where we can successfully merge the content here. |
|
| 8446 | var mine = { offset: mineOffset, lines: mineLines, index: 0 }, |
|
| @@ 159-159 (lines=1) @@ | ||
| 156 | }; |
|
| 157 | } |
|
| 158 | ||
| 159 | function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) { |
|
| 160 | // This will generally result in a conflicted hunk, but there are cases where the context |
|
| 161 | // is the only overlap where we can successfully merge the content here. |
|
| 162 | var mine = { offset: mineOffset, lines: mineLines, index: 0 }, |
|
