diff3.c revision 7c03df68
1