Skip to content

Commit a5962b7

Browse files
committed
Fix spelling mistakes
1 parent 85ebc4e commit a5962b7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

crates/gitbutler-branch-actions/src/integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pub fn update_workspace_commit(
164164
let mut message = GITBUTLER_WORKSPACE_COMMIT_TITLE.to_string();
165165
message.push_str("\n\n");
166166
if !virtual_branches.is_empty() {
167-
message.push_str("This is an merge commit the virtual branches in your workspace.\n\n");
167+
message.push_str("This is a merge commit the virtual branches in your workspace.\n\n");
168168
} else {
169169
message.push_str("This is placeholder commit and will be replaced by a merge of your");
170170
message.push_str("virtual branches.\n\n");

crates/gitbutler-diff/src/diff.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ impl GitHunk {
9292

9393
/// Comparison
9494
impl GitHunk {
95-
/// workspace_intersects_unapplied is used to determine if a hunk from a diff between workspace and the trunk intersects with an unapplied hunk.
96-
/// We want to use the new start/end for the integraiton hunk and the old start/end for the unapplied hunk.
95+
/// workspace_intersects_unapplied is used to determine if a hunk from a diff between workspace
96+
/// and the trunk intersects with an unapplied hunk. We want to use the new start/end for the
97+
/// integration hunk and the old start/end for the unapplied hunk.
9798
pub fn workspace_intersects_unapplied(
9899
workspace_hunk: &GitHunk,
99100
unapplied_hunk: &GitHunk,

0 commit comments

Comments
 (0)