X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-unprocessable;h=5e8652230add036e5234ea4eea762d604dd63cb8;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=caa5321f899c6498de46d5258982454d224018c8;hpb=fd60a31ac3b7308570eee56f1e3c8e5ef0ffafe1;p=dgit.git

diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable
index caa5321f..5e865223 100755
--- a/tests/tests/gdr-unprocessable
+++ b/tests/tests/gdr-unprocessable
@@ -4,6 +4,7 @@ set -e
 
 t-dependencies GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp
 
 cd $p
@@ -13,7 +14,7 @@ t-dgit setup-mergechangelogs
 subcmd () {
 	cmd=("$@")
 
-	branch merge 'complex merge'
+	branch merge 'general two-parent merge'
 	branch origin 'origin commit'
 }