Remove wrong cast.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26033 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Can undo mark block.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26034 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: On saving, ask user how to save marked blocks (include, exclude, ignore).

Follow up of comment http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074458

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26035 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
to avoid overwriting a "mark as read" operation, only overwrite these values if the last found HEAD revision has changed: in that case there would be new unread items anyway and overwriting the "mark all as read" is almost expected.


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk@26036 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
update pot file with recent resource changes.

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