My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ce515f
)
t7800: remove whitespace before redirect
author
David Aguilar
<davvid@gmail.com>
Wed, 15 Mar 2017 06:54:04 +0000
(23:54 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 15 Mar 2017 18:57:16 +0000
(11:57 -0700)
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7800-difftool.sh
patch
|
blob
|
history
diff --git
a/t/t7800-difftool.sh
b/t/t7800-difftool.sh
index
25241f4
..
e1ec292
100755
(executable)
--- 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 &&