diff -Naur a/ b/ > patchfile
cd a/
patch -p1 < ../patchfile

patch to "a/", so now "a/" is the same as "b/"