diff3.c revision 190c4c24
1