Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 504802c987f7dc644c63d0e0d0a41275b556d82a..a6bc028a57115729d38e4b228cd259880d0bf6f8 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -57,7 +57,7 @@ test_expect_success 'conflicting merge' '
        test_must_fail git merge first
 '
 
-sha1=$(sed -e 's/      .*//' .git/MERGE_RR)
+sha1=$(perl -pe 's/    .*//' .git/MERGE_RR)
 rr=.git/rr-cache/$sha1
 test_expect_success 'recorded preimage' "grep ^=======$ $rr/preimage"