Given two graphs and , we consider edge-colorings of in which every copy of has at least two edges of the same color. Let be the maximum number of colors used in such a coloring of . Erdős, Simonovits, and Sós determined the asymptotic behavior of when , and contains no edge with . We study the function when , or , and is .