Please disregard. I apologize - somehow my format-patch/send-email went awry. Thanks, Ben > -----Original Message----- > From: Ben Peart [mailto:peartben@xxxxxxxxx] > Sent: Friday, March 24, 2017 11:27 AM > To: git@xxxxxxxxxxxxxxx > Cc: Ben Peart <Ben.Peart@xxxxxxxxxxxxx>; christian.couder@xxxxxxxxx; > larsxschneider@xxxxxxxxx; David Aguilar <davvid@xxxxxxxxx>; Junio C > Hamano <gitster@xxxxxxxxx> > Subject: [PATCH v2 1/4] t7800: remove whitespace before redirect > > From: David Aguilar <davvid@xxxxxxxxx> > > Signed-off-by: David Aguilar <davvid@xxxxxxxxx> > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > Signed-off-by: Ben Peart <benpeart@xxxxxxxxxxxxx> > --- > 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