Merge branch 'ae/better-template-failure-report' into maint

diff --git a/builtin/add.c b/builtin/add.c
index 42c906ea06b3d20d88ed6ba1c83d894d4e24f163..1d74763f58d893619501427bcee0cc04c2878a02 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -21,8 +21,7 @@ static const char * const builtin_add_usage[] = {
 static int patch_interactive, add_interactive, edit_interactive;
 static int take_worktree_changes;
 
-struct update_callback_data
-{
+struct update_callback_data {
        int flags;
        int add_errors;
 };