@property<EOL><INDENT>def merge_conflicts(self):<DEDENT>
raise NotImplementedError()<EOL>
The filenames of any files with merge conflicts (a list of strings).

This property needs to be implemented by subclasses.