From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Oct 2011 06:55:22 +0000 (-0700)
Subject: Merge branch 'maint-1.7.3' into maint
X-Git-Tag: v1.7.8-rc0~7^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=982d1dce349732539780ee81bb79c8ab26eaed20;p=git.git

Merge branch 'maint-1.7.3' into maint

* maint-1.7.3:
  Reindent closing bracket using tab instead of spaces
---

982d1dce349732539780ee81bb79c8ab26eaed20
diff --cc wt-status.c
index 8836a527d,e0a326056..70fdb76ff
--- a/wt-status.c
+++ b/wt-status.c
@@@ -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);
  }