You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/handlers/check_commits/no_merges.rs
+2-4Lines changed: 2 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -54,8 +54,7 @@ fn get_default_message<'a>(
54
54
commits:implIntoIterator<Item = &'astr>,
55
55
) -> String{
56
56
letmut message = format!(
57
-
"
58
-
The following commits have merge commits (commits with multiple parents) in your changes. \
57
+
"The following commits have merge commits (commits with multiple parents) in your changes. \
59
58
We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) \
60
59
so these commits will need to be removed for this pull request to be merged.
61
60
"
@@ -126,8 +125,7 @@ fn end_to_end() {
126
125
)else{
127
126
unreachable!()
128
127
};
129
-
assert_eq!(warning,"
130
-
The following commits have merge commits (commits with multiple parents) in your changes. We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) so these commits will need to be removed for this pull request to be merged.
128
+
assert_eq!(warning,"The following commits have merge commits (commits with multiple parents) in your changes. We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) so these commits will need to be removed for this pull request to be merged.
131
129
- 9cc6dce67c917fe5937e984f58f5003ccbb5c37e
132
130
133
131
You can start a rebase with the following commands:
0 commit comments