Have git use patience diff by default.