From: Ben Peart <ben.peart@microsoft.com>
Date: Fri, 24 Mar 2017 16:21:55 GMT
Subject: RE: [PATCH v2 1/4] t7800: remove whitespace before redirect
Message-ID: <BL2PR03MB32312344027A7C07573AC85F43E0@BL2PR03MB323.namprd03.prod.outlook.com>
In-Reply-To: <20170324152726.14632-3-benpeart@microsoft.com>

Please disregard.  I apologize - somehow my format-patch/send-email went awry. 

Thanks,

Ben

> -----Original Message-----
> From: Ben Peart [mailto:peartben@gmail.com]
> Sent: Friday, March 24, 2017 11:27 AM
> To: git@vger.kernel.org
> Cc: Ben Peart <Ben.Peart@microsoft.com>; christian.couder@gmail.com;
> larsxschneider@gmail.com; David Aguilar <davvid@gmail.com>; Junio C
> Hamano <gitster@pobox.com>
> Subject: [PATCH v2 1/4] t7800: remove whitespace before redirect
> 
> From: David Aguilar <davvid@gmail.com>
> 
> Signed-off-by: David Aguilar <davvid@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Ben Peart <benpeart@microsoft.com>
> ---
>  t/t7800-difftool.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index
> 25241f4096..e1ec292718 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -428,7 +428,7 @@ run_dir_diff_test 'difftool --dir-diff branch from
> subdirectory' '
>  		git difftool --dir-diff $symlinks --extcmd ls branch >output &&
>  		# "sub" must only exist in "right"
>  		# "file" and "file2" must be listed in both "left" and "right"
> -		grep sub output > sub-output &&
> +		grep sub output >sub-output &&
>  		test_line_count = 1 sub-output &&
>  		grep file"$" output >file-output &&
>  		test_line_count = 2 file-output &&
> --
> 2.12.0.gvfs.1.43.g876ba2a