ZP-205 - added: stop conflict detection if processing takes too long (more than 15 secs and 5 changes to go)
ZP-205
- added: stop conflict detection if processing takes too long (more than 15 secs and 5 changes to go)

git-svn-id: e3f25a334aa43152cddd05ecb5577c2dd0a175f7@1420 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

svn2github/Z-Push_org-src