make it so diff can use -y; limit confusion