diff -uNp
update -P
checkout -P
rdiff -u