#862648 O: makepatch -- generate/apply patch files with more functionality than plain diff