[TODO] Use `-Xpatience` for cherry-picking?

[webknjaz]

(or diff-algorithm=patience?)

https://git-scm.com/docs/git-cherry-pick suggests that with the patience algorithm, the automatic conflict resolution may succeed more often.