checkout -P
update -Pd
rdiff -u
diff -u