diff3: sync with upstream

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

Obtained from: OpenBSD