void (UpdatedFiles updatedFiles) { updatedFiles.registerGroup(new FileGroup(VcsBundle.message("update.group.name.merged.with.property.conflicts"), VcsBundle.message("status.group.name.will.be.merged.with.property.conflicts"), false, FileGroup.MERGED_WITH_PROPERTY_CONFLICT_ID, false)); updatedFiles.registerGroup(new FileGroup(VcsBundle.message("update.group.name.merged.with.tree.conflicts"), VcsBundle.message("status.group.name.will.be.merged.with.tree.conflicts"), false, FileGroup.MERGED_WITH_TREE_CONFLICT, false)); }