diff3: sync with upstream

• replace realloc calls with reallocarray calls
• fix merging of files that lack newlines

Obtained from: OpenBSD

(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61)