to-be-merged branch is to-be-rebased

See mhagger#151
abitrolly · Jun 16, 2020 · aa0a81c · aa0a81c
1 parent d2e19f9
commit aa0a81c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gitimerge.py b/gitimerge.py
@@ -2391,7 +2391,7 @@ def _check_no_merges(git, commits):
             ]
         if multiparent_commits:
             raise Failure(
-                'The following commits on the to-be-merged branch are merge commits:\n'
+                'The following commits on the to-be-rebased branch are merge commits:\n'
                 '    %s\n'
                 '--goal=\'rebase\' is not yet supported for branches that include merges.\n'
                 % ('\n    '.join(multiparent_commits),)