X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4200-rerere.sh;h=a46d7f74bedb105297a9015af9f9098c84365100;hb=75d8ff138dd640a117c6aaa625d0f6b835adbd3a;hp=6ba63d7173ba5d333d80c017c4ef5a8c77b90a11;hpb=abbf594763a14e9c00c61f688e45bed636f1eb52;p=git.git diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 6ba63d717..a46d7f74b 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" @@ -148,5 +148,3 @@ test_expect_success 'old records rest in peace' \ "test ! -f $rr/preimage && test ! -f $rr2/preimage" test_done - -