X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=userdiff.c;h=3681062ebfef85af08d71ed6e1ff734804906d6a;hb=71ee483abd44b1a69cd2ac005c75d3c885830a5c;hp=d95257ab3bd4fafa59b3ed2aa58c480de274227d;hpb=4deca329f5da1552c8d087975dd5107519cabef7;p=git.git

diff --git a/userdiff.c b/userdiff.c
index d95257ab3..3681062eb 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -120,7 +120,7 @@ static int parse_tristate(int *b, const char *k, const char *v)
 	return 1;
 }
 
-int userdiff_config_basic(const char *k, const char *v)
+int userdiff_config(const char *k, const char *v)
 {
 	struct userdiff_driver *drv;
 
@@ -130,14 +130,6 @@ int userdiff_config_basic(const char *k, const char *v)
 		return parse_funcname(&drv->funcname, k, v, REG_EXTENDED);
 	if ((drv = parse_driver(k, v, "binary")))
 		return parse_tristate(&drv->binary, k, v);
-
-	return 0;
-}
-
-int userdiff_config_porcelain(const char *k, const char *v)
-{
-	struct userdiff_driver *drv;
-
 	if ((drv = parse_driver(k, v, "command")))
 		return parse_string(&drv->external, k, v);
 	if ((drv = parse_driver(k, v, "textconv")))