diff3.c revision 702dda43
1