[Bug 299438] eclipse fileconflicts