diff3.c revision ca53a844
1