issue373
Created originally on Bitbucket by ice-mmaclean (Matt MacLean)
Was already merged in Bitbucket before import, marked as merged by the import user
- issue373 - prompts the user during a merge for a resolution (delete, keep or rename) for files that have been modified on one branch and deleted on the other