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=14d1e8e2cb004b62e50712f0a49f0ad16f6a06d7;hpb=89108c5f44ad57febbb24a28d605a5c6322d14c2;p=dgit.git

diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable
index 14d1e8e2..5e865223 100755
--- a/tests/tests/gdr-unprocessable
+++ b/tests/tests/gdr-unprocessable
@@ -14,7 +14,7 @@ t-dgit setup-mergechangelogs
 subcmd () {
 	cmd=("$@")
 
-	branch merge 'complex merge'
+	branch merge 'general two-parent merge'
 	branch origin 'origin commit'
 }