Merge pull request #152 from abitrolly/patch-1

mhagger · web-flow · commit 5de53a1df2df · 2020-06-16T17:09:08.000+02:00
`to-be-merged` branch is `to-be-rebased`
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),)

Original file line number	Diff line number	Diff line change
`@@ -2391,7 +2391,7 @@ def _check_no_merges(git, commits):`
`2391`	`2391`	`]`
`2392`	`2392`	`if multiparent_commits:`
`2393`	`2393`	`raise Failure(`
`2394`		`- 'The following commits on the to-be-merged branch are merge commits:\n'`
	`2394`	`+ 'The following commits on the to-be-rebased branch are merge commits:\n'`
`2395`	`2395`	`' %s\n'`
`2396`	`2396`	`'--goal=\'rebase\' is not yet supported for branches that include merges.\n'`
`2397`	`2397`	`% ('\n '.join(multiparent_commits),)`