1 --- merge.c.orig        2008-02-17 16:11:51.000000000 -0800
 
   2 +++ merge.c     2008-02-17 20:26:24.000000000 -0800
 
   3 @@ -264,7 +264,8 @@ setup(list1, list2, n, size, cmp)
 
   4         int (*cmp)(const void *, const void *);
 
   7 -       int i, length, size2, tmp, sense;
 
   9 +       int length, tmp, sense;
 
  10         u_char *f1, *f2, *s, *l2, *last, *p2;