From: David Aguilar <davvid@gmail.com>
To: Git ML <git@vger.kernel.org>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
Christophe Macabiau <christophemacabiau@gmail.com>
Subject: [PATCH 1/3] t7800: remove whitespace before redirect
Date: Tue, 14 Mar 2017 23:54:04 -0700 [thread overview]
Message-ID: <20170315065406.6739-1-davvid@gmail.com> (raw)
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Cleanup before the fix.
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.309.gffef9e61c2
next reply other threads:[~2017-03-15 6:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 6:54 David Aguilar [this message]
2017-03-15 6:54 ` [PATCH 2/3] t7800: cleanup cruft left behind by tests David Aguilar
2017-03-15 6:54 ` [PATCH 3/3] difftool: handle modified symlinks in dir-diff mode David Aguilar
2017-03-15 16:41 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170315065406.6739-1-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=christophemacabiau@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.