npm

wiggle

Apply patches with conflicting changes by merging overlapping sections

brewmacoslinux
Try with needOr install directly
Source

About

Program for applying patches with conflicting changes

Commands

wiggle

Examples

Apply a patch file to a target file, merging conflicting changes$ wiggle -p1 < changes.patch
Merge two versions with a common ancestor (3-way merge)$ wiggle -m original.txt current.txt updated.txt
View differences between files in wiggle's merge format$ wiggle -d file1.txt file2.txt