diff3.c revision d458eb8d
1