> turn on "diff3" ... there are many situations where you just don't have enough information to properly resolve a merge without it That's right. Here's an exa

> turn on "diff3" ... there are many situations where you just don't have enough information to properly resolve a merge without it That's right. Here's an example I wrote up: https://stackoverflow.com/a/63739655/997606 https://stackoverflow.com/a/63739655/997606