Merge branch 'jn/vcs-svn-cleanup' into next

diff --git a/diff.h b/diff.h
index 5755f465de3c11215d12ce9455936c6755f13426..aca150ba2e0f0b0a984e7f15c292af5f5b057d61 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -195,7 +195,7 @@ struct diff_options {
                COLOR_MOVED_ZEBRA_DIM = 3,
        } color_moved;
        #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
-       #define COLOR_MOVED_MIN_BLOCK_LENGTH 3
+       #define COLOR_MOVED_MIN_ALNUM_COUNT 20
 };
 
 void diff_emit_submodule_del(struct diff_options *o, const char *line);