gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-28 20:15:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix spelling mistakes

Browse Source
This commit is contained in:
Mattias Granlund 2024-08-30 11:29:07 +03:00
parent 85ebc4ea78
commit a5962b7e46
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/gitbutler-branch-actions/src/integration.rs
View File

@ -164,7 +164,7 @@ pub fn update_workspace_commit(
let mut message = GITBUTLER_WORKSPACE_COMMIT_TITLE.to_string();
message.push_str("\n\n");
if !virtual_branches.is_empty() {
message.push_str("This is an merge commit the virtual branches in your workspace.\n\n");
message.push_str("This is a merge commit the virtual branches in your workspace.\n\n");
} else {
message.push_str("This is placeholder commit and will be replaced by a merge of your");
message.push_str("virtual branches.\n\n");

5
crates/gitbutler-diff/src/diff.rs
View File

@ -92,8 +92,9 @@ impl GitHunk {
/// Comparison
impl GitHunk {
/// workspace_intersects_unapplied is used to determine if a hunk from a diff between workspace and the trunk intersects with an unapplied hunk.
/// We want to use the new start/end for the integraiton hunk and the old start/end for the unapplied hunk.
/// workspace_intersects_unapplied is used to determine if a hunk from a diff between workspace
/// and the trunk intersects with an unapplied hunk. We want to use the new start/end for the
/// integration hunk and the old start/end for the unapplied hunk.
pub fn workspace_intersects_unapplied(
workspace_hunk: &GitHunk,
unapplied_hunk: &GitHunk,