Many comments have mentioned both the benefits to diffing, and various --word-diff options. Unfortunately word-merge tools are harder to find. You can of cour

Many comments have mentioned both the benefits to diffing, and various --word-diff options. Unfortunately word-merge tools are harder to find. You can of course use smudge/clean filters to unwrap and rewrap text, but those are quite fiddly to set up and fragile in practice. It isn't the main point of https://github.com/neilbrown/wiggle https://github.com/neilbrown/wiggle , but it can actually diff and merge on a word basis. A git merge driver is fairly easy to set up.