diff3.c revision 9520071f
1