t7610-mergetool: use test_cmp instead of test $(cat file) = $txt

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 06a81b54c75d5948b31c03152609fccb1311c12f..5c1c86c193ab79bd89212d0eefd5a114ec542f7d 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -76,6 +76,7 @@ PassEnv GIT_VALGRIND
 PassEnv GIT_VALGRIND_OPTIONS
 PassEnv GNUPGHOME
 PassEnv ASAN_OPTIONS
+PassEnv LSAN_OPTIONS
 PassEnv GIT_TRACE
 PassEnv GIT_CONFIG_NOSYSTEM
 PassEnv GIT_TEST_SIDEBAND_ALL