mergetool: Add a test for running mergetool in a sub-directory

diff --git a/userdiff.h b/userdiff.h
index 1c1eb042b44fc9e5085c34ffbd06e7e55043580b..ba2945770b379f51aa8da45d112a2ef896ec4c10 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -11,10 +11,10 @@ struct userdiff_driver {
        const char *external;
        int binary;
        struct userdiff_funcname funcname;
+       const char *textconv;
 };
 
-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);