The only changes is that we now depend on a released version of `thrift`.
Tree
FileConflictData
ConflictHunk
files.rs