Merge branch 'ls/travis-submitting-patches' into HEAD

diff --git a/userdiff.h b/userdiff.h
index 942d5949501027fb5d30e0d59629aab38fd2669a..2ef0ce545278ea2f40526c42303c541736643bd5 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -23,4 +23,10 @@ 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);
 
+/*
+ * Initialize any textconv-related fields in the driver and return it, or NULL
+ * if it does not have textconv enabled at all.
+ */
+struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
+
 #endif /* USERDIFF */