From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:03 +0000 (-0700)
Subject: Merge branch 'ks/t7508-indent-fix' into maint
X-Git-Tag: v2.13.3~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f3a16c390f428af64b8d34d587cc482b70f8666?hp=-c

Merge branch 'ks/t7508-indent-fix' into maint

Cosmetic update to a test.

* ks/t7508-indent-fix:
t7508: fix a broken indentation
---

8f3a16c390f428af64b8d34d587cc482b70f8666
diff --combined t/t7508-status.sh
index 5edcc6edfe,b5860fcb8b..35ea0b7074
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@@ -360,7 -360,7 +360,7 @@@ EO
  test_expect_success 'status -s -b' '
  
  	git status -s -b >output &&
 -	test_cmp expect output
 +	test_i18ncmp expect output
  
  '
  
@@@ -370,7 -370,7 +370,7 @@@ test_expect_success 'status -s -z -b' 
  	git status -s -z -b >output &&
  	nul_to_q <output >output.q &&
  	mv output.q output &&
 -	test_cmp expect output
 +	test_i18ncmp expect output
  '
  
  test_expect_success 'setup dir3' '
@@@ -687,7 -687,7 +687,7 @@@ EO
  test_expect_success 'status -s -b with color.status' '
  
  	git status -s -b | test_decode_color >output &&
 -	test_cmp expect output
 +	test_i18ncmp expect output
  
  '
  
@@@ -1494,7 -1494,7 +1494,7 @@@ EO
  test_expect_success 'git commit -m will commit a staged but ignored submodule' '
  	git commit -uno -m message &&
  	git status -s --ignore-submodules=dirty >output &&
- 	 test_i18ngrep ! "^M. sm" output &&
+ 	test_i18ngrep ! "^M. sm" output &&
  	git config --remove-section submodule.subname &&
  	git config -f .gitmodules  --remove-section submodule.subname
  '