Test suite: Use "dgit setup-mergechangelogs" and abolish t-prep-mergechangelogs

1 files changed, 0 insertions, 9 deletions

diff --git a/tests/lib b/tests/lib
index 9fc056e..fbe04b7 100644
--- a/tests/lib
+++ b/tests/lib
@@ -456,15 +456,6 @@ t-tstunt-parsechangelog () {
 	t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
-t-prep-mergechangelogs () {
-	local b=merge.dpkg-mergechangelogs
-	git config $b.name 'debian/changelog merge driver'
-	git config $b.driver 'dpkg-mergechangelogs -m %O %A %B %A'
-	mkdir -p .git/info
-	echo >>.git/info/attributes \
-		'debian/changelog merge=dpkg-mergechangelogs'
-}
-
 t-ref-dsc-dgit () {
 	local dsc=${p}_${v}.dsc
 	local val=`t-822-field $tmp/incoming/$dsc Dgit`