X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=b4c1128c9a82f834b7490ff83e8750257fe56049;hp=dd7a67ddc9dd772d341afade23fc202569782e69;hb=1f80529a13489abd8606d95045d264733390903a;hpb=0d6cdd1cec853a132aacc3f52c1cb7c585e02da5

diff --git a/tests/lib b/tests/lib
index dd7a67dd..b4c1128c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -552,6 +552,10 @@ t-gbp-example-prep () {
 	t-gbp-unapplied-pq2qc
 
 	t-commit 'some updates' 1.0-2
+
+	git merge -s ours \
+		-m 'Pseudo-merge to make descendant of archive' \
+		remotes/dgit/dgit/sid
 }
 
 t-commit () {