Merge branch 'rj/add-chmod-error-message'

diff --git a/diff.c b/diff.c
index 85e714f6c68d24e11228b69d2511c49811c979b4..9c382580306e340ed6333f96bc4919c4c507a7b9 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -299,9 +299,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       if (git_color_config(var, value, cb) < 0)
-               return -1;
-
        return git_diff_basic_config(var, value, cb);
 }