Don't ask whether to mark a file as resolved if we're saving before doing that anyway.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/TortoiseMerge@24194 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Keep the modified state for each view in the undo-state.

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