Lots of new features and important bugfixes. Thanks, everyone!
Tree
FileConflictData
ConflictHunk
files.rs