diff options
Diffstat (limited to 'tests/tests/gdr-unprocessable')
| -rwxr-xr-x | tests/tests/gdr-unprocessable | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-unprocessable b/tests/tests/gdr-unprocessable index 14d1e8e..5e86522 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' } |