wiggle
A patch application tool resolving conflicts in patches that patch cannot handle. tldr-pages
On several platforms
Several platforms
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.
Apply changes from the patch file to the original file
wiggle path/to/file.patchIdentifyApply changes to the output file
wiggle path/to/file.patch --output path/to/output_file.txtIdentifyTake any changes in file.rej that could not have been applied and merge them into a file
wiggle --replace path/to/file path/to/file.rejIdentifyExtract one branch of a patch or merge file
wiggle --extract path/to/file.patchIdentifyApply a patch and save the compared words to the output file
wiggle --words path/to/my_word_patch.patch --output path/to/word_patched_code.cIdentifyDisplay help about the merge function
wiggle --merge --helpIdentify