diff -u   diff -y