On Tue, Aug 19, 2014 at 10:14:30PM -0400, Jeff King wrote: > diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh > index 1019d7b..71a664d 100755 > --- a/t/t4038-diff-combined.sh > +++ b/t/t4038-diff-combined.sh > @@ -401,4 +401,38 @@ test_expect_success 'combine diff missing delete bug' ' > compare_diff_patch expected actual > ' > > +test_expect_success 'combine diff gets tree sorting right' ' > + # create a directory and a file that sort differently in trees > + # versus byte-wise (implied "/" sorts ".") This should be s/sorts/& after/, of course. -Peff -- 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