The patch is now posted to bugzilla as [Bug 29450]. I believe that conforms to the patches.html document cited below. Although that document says -C3 is acceptable, I have submitted it in the preferential -u format (which I also prefer, actually).
It says use -u, but if you absolutely *can't* do -u, then of the remaining options, -C3 is the best, or at least, that is what it is meant to say.
