From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 06:43:19 +0000 (-0800)
Subject: Merge branch 'nd/diffstat-gramnum'
X-Git-Tag: v1.7.10-rc0~94
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ef80c2d8998593852be2fb0546c8e4a518a6bf1?ds=inline;hp=-c

Merge branch 'nd/diffstat-gramnum'

* nd/diffstat-gramnum:
Use correct grammar in diffstat summary line
---

2ef80c2d8998593852be2fb0546c8e4a518a6bf1
diff --combined t/t5150-request-pull.sh
index 7c1dc641de,ec5f7368f9..2af8947eeb
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@@ -95,7 -95,7 +95,7 @@@ test_expect_success 'setup: two script
  	b
  	: diffstat
  	n
- 	/ [0-9]* files changed/ {
+ 	/ [0-9]* files* changed/ {
  		a\\
  	DIFFSTAT
  		b
@@@ -179,7 -179,11 +179,7 @@@ test_expect_success 'request names an a
  		read repository &&
  		read branch
  	} <digest &&
 -	{
 -		test "$branch" = full ||
 -		test "$branch" = master ||
 -		test "$branch" = for-upstream
 -	}
 +	test "$branch" = tags/full
  
  '