aboutsummaryrefslogtreecommitdiff
path: root/tests/release.testscript
diff options
context:
space:
mode:
Diffstat (limited to 'tests/release.testscript')
-rw-r--r--tests/release.testscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/release.testscript b/tests/release.testscript
index 92c211b..c7f53f1 100644
--- a/tests/release.testscript
+++ b/tests/release.testscript
@@ -50,7 +50,7 @@ release += 2>!
#
gp2 = $g -C prj2
clone2 = $g clone prj.git prj2 &prj2/***
-pull2 = $gp2 pull
+pull2 = $gp2 pull --ff-only
fetch2 = $gp2 fetch
log2 = $gp2 log '--pretty=format:"%d %s"'