MCPcopy Index your code
hub / github.com/bigcode-project/jupytercoder / selectField

Function selectField

src/diff.js:1226–1236  ·  view source on GitHub ↗
(index, mine, theirs)

Source from the content-addressed store, hash-verified

1224 }
1225
1226 function selectField(index, mine, theirs) {
1227 if (mine === theirs) {
1228 return mine;
1229 } else {
1230 index.conflict = true;
1231 return {
1232 mine: mine,
1233 theirs: theirs
1234 };
1235 }
1236 }
1237
1238 function hunkBefore(test, check) {
1239 return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;

Callers 1

mergeFunction · 0.85

Calls

no outgoing calls

Tested by

no test coverage detected