From 43c0e52162f40e99fbf99ccdfa70abff83472208 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jul 2016 12:52:47 +0100
Subject: Test suite: t-gbp-example-prep: Arrange to be FF from the archive

Otherwise pushes will necessarily (spuriously) fail.
---
 tests/lib | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/lib b/tests/lib
index dd7a67d..b4c1128 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 () {
-- 
cgit v1.2.3