nl_tokens: Create a merge commit builder
pl_tokens: function mergeCommit ( treeConflict , parents , options ) { options = options || { } ; const opts = { } ; // Assume the commit is not empty opts . empty = <mask> ; // Parent SHAs opts . parents = new Immutable . List ( parents ) ; opts . author = options . author ; opts . message = options . message || 'Merged commit' ; // Get the solved tree entries const solvedEntries = _getSolvedEntries ( treeConflict ) ; opts . treeEntries = solvedEntries ; // Create map of blobs that needs to be created const solvedConflicts = treeConflict . getConflicts ( ) ; opts . blobs = solvedEntries . filter ( ( treeEntry ) => { return ! treeEntry . hasSha ( ) ; } ) . map ( ( treeEntry , path ) => { return solvedConflicts . get ( path ) . getSolvedContent ( ) ; } ) ; return CommitBuilder . create ( opts ) ; }