- $merge->set('links', new ContentProvider('commit', 'tree_merge_diff', array('hash' => $commit['id'], 'parent' => $commit['parent'][$i], 'file' => $entry['file'], 'id' => ($i + 1))));
+ $params = array(
+ 'hash' => $commit['id'],
+ 'parent' => $commit['parent'][$i],
+ 'file' => $entry['file'],
+ 'file_hash' => $entry['to_id'],
+ 'parent_file_hash' => $entry['from_id'][$i],
+ 'id' => ($i + 1)
+ );
+ $merge->set('links', new ContentProvider('commit', 'tree_merge_diff', $params));