summaryrefslogtreecommitdiff
path: root/t/t9114-git-svn-dcommit-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
-rwxr-xr-xt/t9114-git-svn-dcommit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index 3077851015..f524d2f383 100755
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup svn repository' '
test_expect_success 'setup git mirror and merge' '
git svn init "$svnrepo" -t tags -T trunk -b branches &&
git svn fetch &&
- git checkout --track -b svn remotes/trunk &&
+ git checkout -b svn remotes/trunk &&
git checkout -b merge &&
echo new file > new_file &&
git add new_file &&