diff3.c revision df092859
1