t6024-recursive-merge: quiet down this test
authorEric Wong <normalperson@yhbt.net>
Thu, 28 Dec 2006 09:10:50 +0000 (01:10 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:28:07 +0000 (01:28 -0800)
commit7d2ba1229c87268e9ec953c18c747817fbbe34b7
treea376e93e407da40b4e612b6c0db7353862762bb8
parentb11bd57a384a7bee21245d3895d77d20c33e4d78
t6024-recursive-merge: quiet down this test

We get an extra measure of error checking here as well.
While we're at it, also removed a less portable use of export.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t6024-recursive-merge.sh