merge-recursive: switch directory rename detection default

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 42a263cadafe55803bacf5e8bc071b9999618fc4..5e27604b24a7357575c1d51c7cafda9f5cb06471 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -93,6 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' '
                sed -n \
                        -e "/^GIT_PREFIX=/d" \
                        -e "/^GIT_TEXTDOMAINDIR=/d" \
+                       -e "/^GIT_TR2_PARENT/d" \
                        -e "/^GIT_/s/=.*//p" |
                sort
        EOF