Regression fix; Use different name for method argument then class attribute has. (ch3cooli)

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