merge: loosen overcautious "working file will be lost" check.