Merge branch 'jk/diff-convfilter-test-fix'

diff --git a/diff.c b/diff.c
index 1918b73d5368d1ad89f501e63777e47763d0d0fe..3e6c752bb77109864f8be170f9b0e2504531b2aa 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1283,7 +1283,7 @@ static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
        emit_binary_diff_body(file, two, one);
 }
 
-void diff_filespec_load_driver(struct diff_filespec *one)
+static void diff_filespec_load_driver(struct diff_filespec *one)
 {
        if (!one->driver)
                one->driver = userdiff_find_by_path(one->path);