[Cvs-cvs] Changes to ccvs/src/base.c [signed-commits2]

[Derek Robert Price]

Index: ccvs/src/base.c
diff -u ccvs/src/base.c:1.1.2.5 ccvs/src/base.c:1.1.2.6
--- ccvs/src/base.c:1.1.2.5     Tue Nov 29 23:44:18 2005
+++ ccvs/src/base.c     Wed Nov 30 05:04:14 2005
@@ -361,7 +361,7 @@
            cvs_output (finfo->fullname, 0);
        cvs_output ("'\n", 2);
 
-       retval = merge (finfo->file, f1, f2, rev1, rev2);
+       retval = merge (finfo->file, finfo->file, f1, f2, rev1, rev2);
     }
     else
        retval = 0;