aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-12 21:50:41 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-12 21:50:41 -0800
commit459d60084fa463203d0adfc99cbf5d6fcd7edd43 (patch)
tree487c0e47c43da393f4bf6b5d915d289cd7a9b06e /diff.c
parentdf5e12f7d405b84de07c3f2dc1afe51b1d594e2c (diff)
parent6ecfd91df5ec462aeded967c9ad21912c249f96e (diff)
downloadgit-459d60084fa463203d0adfc99cbf5d6fcd7edd43.tar.gz
git-459d60084fa463203d0adfc99cbf5d6fcd7edd43.tar.xz
Merge branch 'jk/diff-convfilter-test-fix'
* jk/diff-convfilter-test-fix: Avoid using non-portable `echo -n` in tests. add userdiff textconv tests document the diff driver textconv feature diff: add missing static declaration Conflicts: Documentation/gitattributes.txt
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 1918b73d5..3e6c752bb 100644
--- 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);