wiggle

A patch application tool resolving conflicts in patches that patch cannot handle. Note: Wiggle forcefully applies all changes, merging when conflicts arise, and reporting unresolvable issues. More information: https://manned.org/wiggle.

wiggle path/to/my_patch.patch

wiggle path/to/my_patch.patch -o path/to/output_file.txt

wiggle --replace path/to/file path/to/file.rej

wiggle -x path/to/my_patch.patch

wiggle --words path/to/my_word_patch.patch -o path/to/word_patched_code.c

wiggle --merge --help