Changed handling of conflict file extensions is a usability regression in some situations

I just got my first conflict in a Java project using recent trunk code.
Subversion propagated a .java extension on the conflict files. Which
caused Eclipse to try to compile them. This is bad, because it meant
that I couldn't test the compilation of my resolution of the conflict
until after I'd removed the conflict files.

As a result, I think the new conflict filename behaviour should be
deactivated by default.

Max.