Merge branch 'mg/maint-difftool-vim-readonly' into maint

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 5422c438826254f36d1e00af0e8b882690661276..2f2ab87d96324df35cb56c07d8c416f029ba9f56 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -606,16 +606,14 @@ static void diff_words_append(char *line, unsigned long len,
        buffer->text.ptr[buffer->text.size] = '\0';
 }
 
-struct diff_words_style_elem
-{
+struct diff_words_style_elem {
        const char *prefix;
        const char *suffix;
        const char *color; /* NULL; filled in by the setup code if
                            * color is enabled */
 };
 
-struct diff_words_style
-{
+struct diff_words_style {
        enum diff_words_type type;
        struct diff_words_style_elem new, old, ctx;
        const char *newline;