I'm probably not the only one whose fingers have gotten hard-wired to
use "-u" for "unified diff".