Also replace paths on ^diff lines

utils/import-patches.sed

 #  3. use `git am` to import patches back
 #
 
-/^\(--- a\|+++ b\)/ s:utils/mkit/include:src/include:g
-/^\(--- a\|+++ b\)/ s:utils/mkit/make:src/make.skel:g
-/^\(--- a\|+++ b\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/include:src/include:g
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/make:src/make.skel:g
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
 /^index /           s:100755$:100644: