Patch from ch3cooli:
Fix regression of r24215

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