[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/difflib.h [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/difflib.h [signed-commits2] |
Date: |
Wed, 30 Nov 2005 00:04:16 -0500 |
Index: ccvs/src/difflib.h
diff -u ccvs/src/difflib.h:1.1.2.1 ccvs/src/difflib.h:1.1.2.2
--- ccvs/src/difflib.h:1.1.2.1 Tue Nov 29 23:44:19 2005
+++ ccvs/src/difflib.h Wed Nov 30 05:04:14 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 *dest, const char *j1, const char *j2,
- const char *rev1, const char *rev2);
+int merge (const char *dlabel, const char *dest, const char *j1,
+ const char *j2, const char *rev1, const char *rev2);
#endif /* DIFFLIB_H */