use patience diff for some diff3 merges

Thread:: use patience diff for some diff3 merges

2021-06-10 16:07 Stefan Sperling:
use patience diff for some diff3 merges
- 2021-06-16 09:05 Stefan Sperling:
  use patience diff for some diff3 merges