X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4200-rerere.sh;h=c64ebbb2e9e9eaf3fbb792a4f119cd9a1c2b4352;hb=c288a2f1316b642ff073d4213cf691297610503c;hp=6ba63d7173ba5d333d80c017c4ef5a8c77b90a11;hpb=0220f1ebdee113e02031de0dba2d5e2c8623d6bb;p=git.git diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 6ba63d717..c64ebbb2e 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -44,7 +44,7 @@ mkdir .git/rr-cache test_expect_failure 'conflicting merge' 'git pull . first' -sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR) +sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR) rr=.git/rr-cache/$sha1 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"