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

[Derek Robert Price]

Index: ccvs/src/difflib.h
diff -u ccvs/src/difflib.h:1.1.2.2 ccvs/src/difflib.h:1.1.2.3
--- ccvs/src/difflib.h:1.1.2.2  Wed Nov 30 05:04:14 2005
+++ ccvs/src/difflib.h  Thu Dec  8 15:02:36 2005
@@ -22,7 +22,7 @@
 int call_diff3 (char *out);
 void call_diff_add_arg (const char *s);
 void call_diff_setup (const char *prog, int argc, char * const *argv);
-int merge (const char *dlabel, const char *dest, const char *j1,
-          const char *j2, const char *rev1, const char *rev2);
+int merge (const char *dest, const char *dlabel, const char *j1,
+          const char *j1label, const char *j2, const char *j2label);
 
 #endif /* DIFFLIB_H */