> I almost exclusively use the control system's diff command,
> be it GIT or SVN.

So how do I merge them? If you were merging your own patch on a different system, what is the full command you would use?

> I am running on 3.5.13 sources so  I make all my
> patches under the 3.5.13 code. ( I make sure not to add any conflicts with the
> current GIT head), I just use svn diff and pipe the output into a
> file.

Yes, I remember you are running on 3.5.13. About half the time the patches need some tweaks to merge to the GIT sources. :) That part I deal with easily. The manual editing seems backwards. I don't know how to merge your patches. I just need to now the appropriate command syntax.

Darrell