fix error with merge operator not handing error cases properly (errors wouldn't cancel the operator as they should).
was mixing up OPERATOR_CANCELLED with 0.


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@55491 954f8c5b-7b00-dc11-b283-0030488c597c