diff3.c revision 18fd37a7
1