diff3.c revision 94678ee6
1