git-debrebase: New merge handing, experimental and preliminary

[dgit.git] / tests / tests / gdr-unprocessable

diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable
index 14d1e8e2cb004b62e50712f0a49f0ad16f6a06d7..5e8652230add036e5234ea4eea762d604dd63cb8 100755 (executable)
--- 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'
 }