X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9106-git-svn-dcommit-clobber-series.sh;h=745254665dd2d8f73b8c511b39aca82682bf1bbb;hb=467f42cfa1d298dcaab40e06f8dfa8f80ee345f7;hp=d59acc8d1ade041d01d5a45aa993b26919a0170c;hpb=c78a24986d4d3faff810e87dbcd0ac99f0eabbce;p=git.git diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh index d59acc8d1..745254665 100755 --- a/t/t9106-git-svn-dcommit-clobber-series.sh +++ b/t/t9106-git-svn-dcommit-clobber-series.sh @@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' " cd tmp && perl -i -p -e 's/^58\$/5588/' file && perl -i -p -e 's/^61\$/6611/' file && + poke file && test x\"\`sed -n -e 58p < file\`\" = x5588 && test x\"\`sed -n -e 61p < file\`\" = x6611 && svn commit -m '58 => 5588, 61 => 6611' &&