Folder

Viewer

Folder viewer screenshot

Differ

Folder differ screenshot

3-way merge (or N-way)

Folder 3-way diff screenshot