[CFT] new patch and reject merging tool

From: Chris Mason
Date: Mon Oct 09 2006 - 11:32:44 EST


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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/