[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.1 ccvs/src/difflib.c:1.1.2.2
--- ccvs/src/difflib.c:1.1.2.1  Tue Nov 29 23:44:19 2005
+++ ccvs/src/difflib.c  Wed Nov 30 05:04:14 2005
@@ -184,7 +184,7 @@
  * particular files using strings REV1 & REV2.
  */
 int
-merge (const char *dest, const char *j1, const char *j2,
+merge (const char *dlabel, const char *dest, const char *j1, const char *j2,
        const char *rev1, const char *rev2)
 {
     char *diffout;
@@ -199,7 +199,7 @@
     call_diff_add_arg ("-am");
 
     call_diff_add_arg ("-L");
-    call_diff_add_arg (dest);
+    call_diff_add_arg (dlabel);
     call_diff_add_arg ("-L");
     call_diff_add_arg (rev1);
     call_diff_add_arg ("-L");