nl_tokens: Returns the final TreeEntries for a solved TreeConflict .
pl_tokens: function _getSolvedEntries ( treeConflict ) { const parentEntries = treeConflict . getParent ( ) . getTreeEntries ( ) ; const baseEntries = treeConflict . getBase ( ) . getTreeEntries ( ) ; const headEntries = treeConflict . getHead ( ) . getTreeEntries ( ) ; const baseDiff = _diffEntries ( parentEntries , baseEntries ) ; const headDiff = _diffEntries ( parentEntries , headEntries ) ; const resolvedEntries = treeConflict . getConflicts ( ) . <mask> ( ( solvedConflict ) => { // Convert to TreeEntries (or null for deletion) if ( solvedConflict . isDeleted ( ) ) { return null ; } else { return new TreeEntry ( { sha : solvedConflict . getSolvedSha ( ) || null } ) ; } } ) ; return parentEntries . merge ( baseDiff , headDiff , resolvedEntries ) // Remove deleted entries . filter ( function nonNull ( entry ) { return entry !== null ; } ) ; }