So I made a tool for managing little changes in code&text and it seems to run well enough now, so sharing.
The diff is like from git diff --word-diff, but you can automerge same-line edits, retain spacing&indentation from a selected version, and send the small edits around as patches. Also works great for #LaTeX and #markdown (merging these with plain git is pure pain).
