title: Import patches with conflicting changes for mercurial repository with tortoiseHg
body: <p>I have successfully imported patches without having conflicting changes. But when I try to import patch with conflicting changes it throws an error saying "Hunk #1 FAILED at 11.. ". There is no option to merge changes. Is there any other way to accomplish this?</p>