Riffle 1.2: when the file changes underneath you

A diff is a photograph of two files at a moment in time, and the moment passes. You switch to your editor, save, come back, and Riffle is confidently showing you something that stopped being true a minute ago.

Riffle 1.2 notices. When a file under an open comparison is changed by something else, a 2-way diff re-runs itself against the new content and keeps your place. A merge you've already worked in asks first, because silently reloading a merge would throw away resolutions you'd spent time on. There's also File ▸ Reload from Disk (⌘R) for doing it on demand, and it works on any comparison: a diff, a merge, a folder comparison, or a git review.

The fix underneath this one matters more than the feature. Saving a merge could overwrite the target file without warning when another tool had rewritten it while the merge was open. That's the kind of bug that costs somebody an hour of work and never announces itself, and it doesn't happen now.

Riffle is $29.99 once, with a 14-day full-feature trial and a free tier that keeps unlimited 2-way diff forever. Get it from the Riffle page or with Homebrew: brew install --cask skulkworks/tap/riffle. Full details are in the changelog.