I've just done the same suggestion as Jaap but it's awaiting for moderation.

I didn't know about this "speed search" that you pointed out Marc, thanks for the tip!

By the way for anyone interested I've setup p4merge as conflict solver in SmartGit with the following arguments and it does the job:

${baseFile} ${leftFile} ${rightFile} ${mergedFile}

Please do it! :-) vote vote vote!