Show a recap of files modified in a Pull and Update

In the Synchronize view, a Pull and Update may leave some .orig suffixed files when not using an external merge tool. Although this is the "normal" behavior, I see no reason for these files to remain in the file system once the simple merge algorithm has succeeded.

The solution I envision is a recap window in which each file modified both locally and remotely is listed with its latest conflict status, so that the user can confirm the deletion of the .orig files.

I see two new preferences, one for whether the recap window should be shown, and one whether these files should be automatically deleted.