Hi, On Fri, 29 Feb 2008, Mike Hommey wrote: > diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh > index 149ea85..43b5f15 100755 > --- a/t/t6024-recursive-merge.sh > +++ b/t/t6024-recursive-merge.sh > @@ -81,7 +81,7 @@ EOF > > test_expect_success "virtual trees were processed" "git diff expect out" > > -git reset --hard > +git reset --hard >&3 2>&4 > test_expect_success 'refuse to merge binary files' ' Would it not be _much_ more sensible to pull that command _into_ the test_expect_success? Ciao, Dscho -- 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
