Merge branch 'maint'

diff --git a/userdiff.h b/userdiff.h
index c64c5f56697cc45beadf18d8e645c7096b42c82c..ba2945770b379f51aa8da45d112a2ef896ec4c10 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -9,14 +9,12 @@ struct userdiff_funcname {
 struct userdiff_driver {
        const char *name;
        const char *external;
+       int binary;
        struct userdiff_funcname funcname;
+       const char *textconv;
 };
 
-extern struct userdiff_driver *USERDIFF_ATTR_TRUE;
-extern struct userdiff_driver *USERDIFF_ATTR_FALSE;
-
-int userdiff_config_basic(const char *k, const char *v);
-int userdiff_config_porcelain(const char *k, const char *v);
+int userdiff_config(const char *k, const char *v);
 struct userdiff_driver *userdiff_find_by_name(const char *name);
 struct userdiff_driver *userdiff_find_by_path(const char *path);