mergetest2
Merging with user specified merge failure resolution for files [d]