patched wiggle to serve as a git merge driver for word-wise diffs