| Function | make_tree_with_conflicts | Undocumented |
| Class | TestConflicts | Undocumented |
| Class | TestUnicodePaths | Unicode characters in conflicts should be displayed properly |
| Class | TestUnicodePathsOnAsciiTerminal | Undisplayable unicode characters in conflicts should be escaped |