Hello everyone,
I've reworked my rej code somewhat into a new utility that can apply
unified diffs and git diffs (git patch support is from Brendan Cully).
It has a mode for auto-resolving rejects, but by default it is as safe
as patch, and much faster than rej was.
Download locations and details are here:
http://oss.oracle.com/~mason/mpatch/
-chris