merge-recursive: Cleanup and consolidation of rename_conflict_info

diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
index 337ea59711ac7aca78a27afb92693f88e98aed9d..4594e1ae2f36b5a5582cdb1f2421fdfbd2f8c996 100755 (executable)
--- a/t/t9143-git-svn-gc.sh
+++ b/t/t9143-git-svn-gc.sh
@@ -37,13 +37,11 @@ test_expect_success 'git svn gc runs' 'git svn gc'
 
 test_expect_success 'git svn index removed' '! test -f .git/svn/refs/remotes/git-svn/index'
 
-if perl -MCompress::Zlib -e 0 2>/dev/null
+if test -r .git/svn/refs/remotes/git-svn/unhandled.log.gz
 then
        test_expect_success 'git svn gc produces a valid gzip file' '
                 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
                '
-else
-       say "# Perl Compress::Zlib unavailable, skipping gunzip test"
 fi
 
 test_expect_success 'git svn gc does not change unhandled.log files' '