Add command /saverequiredonconflicts to ask for saving even if there are conflicts in the file.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24464 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac