X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4200-rerere.sh;h=3cbfee704e6238eb31fa1b519567fb064ca27ad8;hb=464509f790f409d95e0820364ef7296d82942d8c;hp=cfcdb69dc890aed55eabf9ec8d13529538e50465;hpb=11bb2d4fa9ebc7481828c25752d8c23233b24c76;p=git.git diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index cfcdb69dc..3cbfee704 100755 --- 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' '\0' > .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'