Sorry about duplicate. Forgot to remove sendemail.to when testing git-
send-email. (Finally tracked down my problems to a bug in
Term::ReadLine::Perl when the prompt was longer than the terminal
width.)
~~ Brian
On Jun 29, 2008, at 9:26 PM, Brian Gernhardt wrote:
Signed-off-by: Brian Gernhardt <benji@xxxxxxxxxxxxxxxxxx>
---
t/t4017-diff-retval.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45..60dd201 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover
conflict markers' '
git --no-pager diff --cached --check >test.out
test $? = 2
) &&
- test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+ test 3 = $(grep "conflict marker" test.out | wc -l) &&
git reset --hard
'
--
1.5.6.105.g6f4b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
