X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9106-git-svn-commit-diff-clobber.sh;h=6f132f2419462c20748b1a6fcb2df36a53ab0f89;hb=0220f1ebdee113e02031de0dba2d5e2c8623d6bb;hp=59b6425ce4e5a265443311b7ed033fe6e8e73add;hpb=1fcdd62adf81a172f45c7c6a58177212d500b9d9;p=git.git diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 59b6425ce..6f132f241 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -18,6 +18,7 @@ test_expect_success 'commit change from svn side' " svn co $svnrepo t.svn && cd t.svn && echo second line from svn >> file && + poke file && svn commit -m 'second line from svn' && cd .. && rm -rf t.svn @@ -45,6 +46,7 @@ test_expect_failure 'dcommit fails to commit because of conflict' " svn co $svnrepo t.svn && cd t.svn && echo fourth line from svn >> file && + poke file && svn commit -m 'fourth line from svn' && cd .. && rm -rf t.svn &&