diff3.c revision 7f7b03f3
1