Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --color -up a/config.def.h b/config.def.h |--- a/config.def.h |+++ b/config.def.h -------------------------- Patching file config.def.h using Plan A... Reversed (or previously applied) patch detected! Assuming -R.Hunk #1 succeeded at 1. No such line 13 in input file, ignoring Hunk #2 failed at 13. 1 out of 2 hunks failed Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --color -up a/slock.c b/slock.c |--- a/slock.c |+++ b/slock.c -------------------------- Patching file slock.c using Plan A... Hunk #1 succeeded at 125 (offset -4 lines). Hunk #2 failed at 408. Hunk #3 failed at 426. 2 out of 3 hunks failed done