diff -uN
checkout -P
update -Pd