Files without Peers handled
Diffmerge major pass