wiggle

Apply rejected patch

$ wiggle --replace [original] [original.rej]

$ wiggle -d [file1] [file2]

$ wiggle -m [original] [changed] [modified]

$ wiggle --browse [file.rej]

wiggle [--replace] [-d] [-m] [options] files

wiggle applies patches that have been rejected by the standard patch utility due to minor conflicts between the patch context and the current file. Where patch requires exact context matching, wiggle performs word-level analysis to find where changes should be applied even when surrounding lines have shifted or been modified.
The tool supports three-way merging of files and can work with both unified diff files and .rej reject files produced by failed patch operations. When conflicts cannot be resolved automatically, an interactive browse mode lets users review and resolve remaining conflicts manually.
This makes wiggle particularly valuable for maintaining long-lived patch series against evolving codebases, where patches frequently fail to apply cleanly due to unrelated changes in nearby code.

--replace

Apply and replace.

Show diff.

Three-way merge.

Interactive browser.

Word-based diff.

For patch failures. May not always work. Line changes needed.

wiggle was created by Neil Brown to help apply patches that were rejected due to minor conflicts.

patch(1), diff(1), merge(1)