aboutsummaryrefslogtreecommitdiff
path: root/t/t9106-git-svn-commit-diff-clobber.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t9106-git-svn-commit-diff-clobber.sh')
-rwxr-xr-xt/t9106-git-svn-commit-diff-clobber.sh2
1 files changed, 2 insertions, 0 deletions
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 &&