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

[Derek Robert Price]

Index: ccvs/src/difflib.c
diff -u ccvs/src/difflib.c:1.1.2.4 ccvs/src/difflib.c:1.1.2.5
--- ccvs/src/difflib.c:1.1.2.4  Thu Dec  1 15:58:44 2005
+++ ccvs/src/difflib.c  Thu Dec  8 15:02:36 2005
@@ -184,8 +184,8 @@
  * particular files using strings REV1 & REV2.
  */
 int
-merge (const char *dlabel, const char *dest, const char *j1, const char *j2,
-       const char *rev1, const char *rev2)
+merge (const char *dest, const char *dlabel, const char *j1,
+       const char *j1label, const char *j2, const char *j2label)
 {
     char *diffout;
     int retval;
@@ -201,9 +201,9 @@
     call_diff_add_arg ("-L");
     call_diff_add_arg (dlabel);
     call_diff_add_arg ("-L");
-    call_diff_add_arg (rev1);
+    call_diff_add_arg (j1label);
     call_diff_add_arg ("-L");
-    call_diff_add_arg (rev2);
+    call_diff_add_arg (j2label);
 
     call_diff_add_arg ("--");
     call_diff_add_arg (dest);
@@ -217,7 +217,7 @@
     else if (retval == 2)
        error (1, 0, "diff3 failed.");
 
-    force_copy_file (diffout, dest);
+    copy_file (diffout, dest);
 
     /* Clean up. */
     if (CVS_UNLINK (diffout) < 0 && !existence_error (errno))