mergetool--lib: Allow custom commands to override built-ins

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index ec7622cbeff251acb68600dc746eb7c5912bb324..3ab670d36aea890e07827b14486e4c49de83bdb5 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -78,7 +78,7 @@ test_expect_success 'activate rerere, old style (conflicting merge)' '
        test_might_fail git config --unset rerere.enabled &&
        test_must_fail git merge first &&
 
-       sha1=$($PERL_PATH -pe "s/       .*//" .git/MERGE_RR) &&
+       sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1 &&
        grep "^=======\$" $rr/preimage &&
        ! test -f $rr/postimage &&
@@ -91,7 +91,7 @@ test_expect_success 'rerere.enabled works, too' '
        git reset --hard &&
        test_must_fail git merge first &&
 
-       sha1=$($PERL_PATH -pe "s/       .*//" .git/MERGE_RR) &&
+       sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1 &&
        grep ^=======$ $rr/preimage
 '
@@ -101,7 +101,7 @@ test_expect_success 'set up rr-cache' '
        git config rerere.enabled true &&
        git reset --hard &&
        test_must_fail git merge first &&
-       sha1=$($PERL_PATH -pe "s/       .*//" .git/MERGE_RR) &&
+       sha1=$("$PERL_PATH" -pe "s/     .*//" .git/MERGE_RR) &&
        rr=.git/rr-cache/$sha1
 '
 
@@ -185,7 +185,7 @@ test_expect_success 'rerere updates postimage timestamp' '
 
 test_expect_success 'rerere clear' '
        rm $rr/postimage &&
-       echo "$sha1     a1" | $PERL_PATH -pe "y/\012/\000/" >.git/MERGE_RR &&
+       echo "$sha1     a1" | "$PERL_PATH" -pe "y/\012/\000/" >.git/MERGE_RR &&
        git rerere clear &&
        ! test -d $rr
 '