File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed
gitbutler-branch-actions/src Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff 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 " ) ;
Original file line number Diff line number Diff line change @@ -92,8 +92,9 @@ impl GitHunk {
9292
9393/// Comparison
9494impl 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 ,
You can’t perform that action at this time.
0 commit comments