Merge branch 'maint-1.7.3' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 06:55:22 +0000 (23:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Oct 2011 06:55:22 +0000 (23:55 -0700)
* maint-1.7.3:
Reindent closing bracket using tab instead of spaces

1  2 
wt-status.c
diff --cc wt-status.c
index 8836a527d0b1980bd4ebdd50b3225f7ce37ccf79,e0a3260566e50248bb59fdba9c9e53c43b46390f..70fdb76ff2b5100c6d20f9f3b758e1ac8df314e1
@@@ -396,10 -316,10 +396,10 @@@ static void wt_status_collect_changes_w
        if (s->ignore_submodule_arg) {
                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-     }
+       }
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;
 -      rev.prune_data = s->pathspec;
 +      init_pathspec(&rev.prune_data, s->pathspec);
        run_diff_files(&rev, 0);
  }