From aa0a81cd8c897a3c26900ffd17de9e3fa367785f Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Tue, 16 Jun 2020 13:45:58 +0300 Subject: [PATCH] `to-be-merged` branch is `to-be-rebased` See #151 --- gitimerge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitimerge.py b/gitimerge.py index fe99c30..b4bc632 100644 --- 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),)