(hunk)
| 1111 | } |
| 1112 | |
| 1113 | function calcLineCount(hunk) { |
| 1114 | var _calcOldNewLineCount = calcOldNewLineCount(hunk.lines), |
| 1115 | oldLines = _calcOldNewLineCount.oldLines, |
| 1116 | newLines = _calcOldNewLineCount.newLines; |
| 1117 | |
| 1118 | if (oldLines !== undefined) { |
| 1119 | hunk.oldLines = oldLines; |
| 1120 | } else { |
| 1121 | delete hunk.oldLines; |
| 1122 | } |
| 1123 | |
| 1124 | if (newLines !== undefined) { |
| 1125 | hunk.newLines = newLines; |
| 1126 | } else { |
| 1127 | delete hunk.newLines; |
| 1128 | } |
| 1129 | } |
| 1130 | function merge(mine, theirs, base) { |
| 1131 | mine = loadPatch(mine, base); |
| 1132 | theirs = loadPatch(theirs, base); |
no test coverage detected