Skip to content

Commit ab55185

Browse files
authored
Merge pull request #1941 from Urgau/no_merges-new-line
Fix new-line at the start in `no_merges` handler
2 parents ae34e11 + 08cad1c commit ab55185

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/handlers/check_commits/no_merges.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ fn get_default_message<'a>(
5454
commits: impl IntoIterator<Item = &'a str>,
5555
) -> String {
5656
let mut 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. \
5958
We have a [no merge policy](https://rustc-dev-guide.rust-lang.org/git.html#no-merge-policy) \
6059
so these commits will need to be removed for this pull request to be merged.
6160
"
@@ -126,8 +125,7 @@ fn end_to_end() {
126125
) else {
127126
unreachable!()
128127
};
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.
131129
- 9cc6dce67c917fe5937e984f58f5003ccbb5c37e
132130
133131
You can start a rebase with the following commands:

0 commit comments

Comments
 (0)