Merge branch 'js/ignore-submodule'

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index eeff3c9c0772daa85302d44552bc9c0d2d9f0280..3cbfee704e6238eb31fa1b519567fb064ca27ad8 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -129,7 +129,7 @@ test_expect_success 'rerere kicked in' "! grep ======= a1"
 test_expect_success 'rerere prefers first change' 'git diff a1 expect'
 
 rm $rr/postimage
-echo "$sha1    a1" | tr '\012' '\000' > .git/rr-cache/MERGE_RR
+echo "$sha1    a1" | perl -pe 'y/\012/\000/' > .git/rr-cache/MERGE_RR
 
 test_expect_success 'rerere clear' 'git rerere clear'