MPatch

mpatch applies diffs and is generally similar to patch, but it can also help resolve a number of common causes of patch rejects.

By default, it applies diffs with the same offset and fuzz rules that patch uses, and mpatch is intended to be as safe as patch for normal usage.