Slightly more sensible defaults for diff output with +q